BUG=chromium:598319
LOG=N

Review-Url: https://codereview.chromium.org/1943263002
Cr-Commit-Position: refs/heads/master@{#35970}