BUG=chromium:485534
R=yangguo@chromium.org
LOG=n

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

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