Merge "One-pass rate control fixes and cleanups"
authorDeb Mukherjee <debargha@google.com>
Tue, 4 Feb 2014 19:12:10 +0000 (11:12 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 4 Feb 2014 19:12:10 +0000 (11:12 -0800)

Trivial merge