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