BUG=chromium:607226, chromium:581412
LOG=N

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