R=machenbach@chromium.org
BUG=chromium:474921
LOG=n

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

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