port 8e28e851 (r32223)

    original commit message:

BUG=

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

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