GitLab

Was reverted in: 54f75614.

Reason for reland: Includes fix for downstream targets.

Change-Id: I2a5f77cdbd40934ae206dd91b2e12e7b5e6553e1
Bug: 986693, 986693
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715004Reviewed-by: Sam Maier <smaier@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680307}