BUG=chromium:603011,chromium:603131
LOG=n

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

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