LOG=N
R=machenbach@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#31101}