BUG=chromium:474921
TBR=jochen@chromium.org, vogelheim@chromium.org,
NOTRY=true

Review-Url: https://codereview.chromium.org/2124003003
Cr-Commit-Position: refs/heads/master@{#37575}