BUG=chromium:474921
LOG=n
R=jochen@chromium.org
TBR=jkummerow@chromium.org, jochen@chromium.org

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

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