GitLab

Also fix some const references surfaced by presubmit.

Bug: 912026
Change-Id: I2661f69f0e63e613a9b8e9d565813c3e27fed340
Reviewed-on: https://chromium-review.googlesource.com/c/1377494Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: Hector Carmona <hcarmona@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619843}