port 56673804 (r32803)

  original commit message:

BUG=

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

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