port 911a5768 (r35301)

  original commit message:

BUG=

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

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