R=ulan@chromium.org
BUG=chromium:473307
LOG=yes

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

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