R=jarin@chromium.org

Committed: https://crrev.com/20eff45de11609934be339dffe46276ff0a4bc22
Cr-Commit-Position: refs/heads/master@{#35509}

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

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