BUG=chromium:581412
LOG=N
R=hpayer@chromium.org

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

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