BUG=chromium:597310
LOG=NO

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

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