GitLab

- Relands fix of https://codereview.chromium.org/2944453002.

Bug: 741020
Change-Id: Id6cb772edd0509afa60c217be02188bf16fcada9
Reviewed-on: https://chromium-review.googlesource.com/567384Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485956}