Merge "adjusted sad_per_bit to correlate with quantizer"