R=ulan@chromium.org
BUG=

Review-Url: https://codereview.chromium.org/1918403003
Cr-Commit-Position: refs/heads/master@{#35853}