This should allow to re-land https://crrev.com/c/1039190

Bug: chromium:871886

Change-Id: If815537410b3fa09902026dc26205421f5c36ae5
Reviewed-on: https://chromium-review.googlesource.com/1169019
Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#55015}