BUG=chromium:468240,chromium:668060

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