port 8e18a5f2 (r37748)

  original commit message:

BUG=

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