GitLab

Also perform some simple cleanup.

Bug: 958073
Change-Id: Idf9e0abbd734af3f60928fd4d26dd9e74da26431
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1591666
Commit-Queue: Michael Wasserman <msw@chromium.org>
Reviewed-by: Tao Wu <wutao@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Auto-Submit: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#656473}