GitLab

Sync changes from https://critique.corp.google.com/#review/277300793
to client side.

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