port 72994124(r32675)

  original commit message:

BUG=

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

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