R=hpayer@chromium.org, szager@chromium.org
TBR=hpayer@chromium.org
BUG=

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

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