BUG=chromium:474921

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