Merge "CCodec: support legacy bitrate change behavior"