port aa75904e (r42270)

  original commit message:

BUG=

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