BUG=chromium:474921
NOTRY=true
TBR=jochen,vogelheim

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