This ports:
https://chromium-review.googlesource.com/c/chromium/src/+/732997

NOTRY=true

Bug: chromium:781724
Change-Id: Ib57e94bfa66f7898c10b14ce0c07a12b0c3d25b8
Reviewed-on: https://chromium-review.googlesource.com/753725
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49140}