Merge "Updates for 1-pass CBR rate control."