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

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

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