port d2efbf25 (r36000)

  original commit message:

BUG=

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