port 7ceaf727 (r32370)

  original commit message:

BUG=

Review URL: https://codereview.chromium.org/1483873002

Cr-Commit-Position: refs/heads/master@{#32388}