BUG=
R=jochen@chromium.org

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

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