port ce1fe78d (r35331)

  original commit message:

BUG=

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

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