Merge "For CBR, keep rate-correction damping factor to 2."