R=ahaas@chromium.org, titzer@chromium.org
BUG=

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

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