Merge "Two pass rc changes."
authorPaul Wilkins <paulwilkins@google.com>
Wed, 8 Oct 2014 11:23:20 +0000 (04:23 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 8 Oct 2014 11:23:20 +0000 (04:23 -0700)

Trivial merge