GitLab

Roll up all the changes for issue 443863 and issue 401971 into google.patch.
google.patch is not code, so no new tests or try runs needed.

BUG=443863,401971
TEST=none needed

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

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