BUG=chromium:435974
LOG=N

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

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