BUG=chromium:485472
LOG=NO
TBR=jochen@chromium.org

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

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