port 09626525 (r30957).

original commit message:

BUG=

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

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