Port https://codereview.chromium.org/1886493002

BUG=chromium:603011, chromium:603131
LOG=n
TBR=jochen@chromium.org

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

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