BUG=chromium:680064
TBR=clemensh@chromium.org, titzer@chromium.org, ahaas@chromium.org
NOTRY=true

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