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

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