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

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