This is the result of an improper rebase in the previous CL.

BUG= none
R=jpp@chromium.org

Review URL: https://codereview.chromium.org/1911983002 .