R=tbreisacher@chromium.org, vitalyp@chromium.org
BUG=393873

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

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