This ports:
https://crrev.com/c/1374050

TBR=sergiyb@chromium.org

Bug: chromium:914712
Change-Id: Ia5eccd9b689ca103d819e65706b4c8ad062a677d
Reviewed-on: https://chromium-review.googlesource.com/c/1375653
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#58208}