Merge "Bias against non-zero mv for large blocks."