port 24622f5f (r31257).

    original commit message:

BUG=

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

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