Merge "Don't use gf_update by default for 1-pass CBR."