BUG=chromium:474921

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