Merge "Minorly modify model_rd_for_sb_y function"