port 40b5c1d4(r36842)

  original commit message:

BUG=

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