GitLab

Sync server-side changes from cl/333594358.

Change-Id: I705eccefefc281280efe45594dc7aed530591a8b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2449069
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@{#813663}