GitLab

Sync server-side changes from cl/324954160 and cl/325736815.

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