GitLab

This reverts commit bb253c29.

This is a reland of the original breaking commit,
d0392055, with a fix for the build
failure.

Bug: 898718
Change-Id: I0e14e97861d060bb6378dc6ad43ca52806812f1e
Reviewed-on: https://chromium-review.googlesource.com/c/1328232
Commit-Queue: Martin Kreichgauer <martinkr@google.com>
Reviewed-by: Adam Langley <agl@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606922}