GitLab

Re-try of crrev.com/c/2182409. The change is the same but this time I
was able to locally repro the original failure (and have no failures
running this) and some fixes have landed since the last attempt.

Test: none
Bug: 1035356
Change-Id: Idc53b58a70f68be05b7ad36efb18c6facdb3ad56
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2226784Reviewed-by: Xiaoqian Dai <xdai@chromium.org>
Commit-Queue: Sammie Quon <sammiequon@chromium.org>
Cr-Commit-Position: refs/heads/master@{#774413}