BUG=410721
LOG=n
R=agable@chromium.org, tandrii@chromium.org

Review URL: https://codereview.chromium.org/699153003

Cr-Commit-Position: refs/heads/master@{#25305}