GitLab

This is a reland of 4fb5e9ec which
should be fine after 4548e4da landed.

Bug: 635619
Change-Id: I374a1f4bc4d8c0ea4fbb91cf9f560ff145c371db
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2024467
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Reviewed-by: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735803}