GitLab

Sync server-side changes from cl/331193690.

Change-Id: I52afbafc55b5dc3804034acaaea08a31aa9cfd23
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2418660
Auto-Submit: Jit Yao Yap <jityao@google.com>
Reviewed-by: Alexander Hendrich <hendrich@chromium.org>
Commit-Queue: Alexander Hendrich <hendrich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810542}