GitLab

This addresses the changes in these CLs

https://chromium-review.googlesource.com/c/chromium/src/+/2376417
https://chromium-review.googlesource.com/c/chromium/src/+/2378801

Bug: 1134854
Change-Id: I360e46cc4d0e8247eed799b7f1c7b1d1c4f9da5d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2447045Reviewed-by: Yulun Wu <yulunwu@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Yulun Wu <yulunwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814035}