Merge "Change to thresholding in rd_variance_adjustment()"