GitLab

In-flight CLs that landed downstream during the upstreaming of these
files resulted in drift; this re-syncs the files to the latest
versions.

BUG=464810

Review URL: https://codereview.chromium.org/1106963003

Cr-Commit-Position: refs/heads/master@{#327059}