This change comes from a6940f7a.

BUG=

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

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