R=jochen@chromium.org
BUG=chromium:457459
LOG=N

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

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