GitLab

Bug: 873739, 873644
Change-Id: I02e0819130678a1398106f0d0faf8068456e28dc
Reviewed-on: https://chromium-review.googlesource.com/1196451
Commit-Queue: David Roger <droger@chromium.org>
Reviewed-by: Hector Carmona <hcarmona@chromium.org>
Reviewed-by: Scott Chen <scottchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589142}