BUG=chromium:471554
LOG=y
R=hpayer@chromium.org

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

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