GitLab

Bug: 1108711, 1108686
Change-Id: Ie653dbee0de591f1ea62abc2380db8cd374fea4f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2315139
Commit-Queue: Anders Hartvoll Ruud <andruud@chromium.org>
Reviewed-by: Xiaocheng Hu <xiaochengh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791812}