Merge "One-pass rate control cleanups/fixes/refactoring"
authorDeb Mukherjee <debargha@google.com>
Wed, 5 Feb 2014 19:50:18 +0000 (11:50 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 5 Feb 2014 19:50:18 +0000 (11:50 -0800)

Trivial merge