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

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