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

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