BUG=chromium:474921 LOG=n Review-Url: https://codereview.chromium.org/1936123002 Cr-Commit-Position: refs/heads/master@{#35939}