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

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