port 78b1585f (r36355)

  original commit message:

BUG=

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