R=ulan@chromium.org
BUG=chromium:581412
LOG=N

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

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