Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/tools/rewrite-user-id.sql b/tools/rewrite-user-id.sql
index b95a0e4..c558912 100644
--- a/tools/rewrite-user-id.sql
+++ b/tools/rewrite-user-id.sql
@@ -1,8 +1,6 @@
--- Copyright 2019 The Chromium Authors. All Rights Reserved.
---
--- Use of this source code is governed by a BSD-style
--- license that can be found in the LICENSE file or at
--- https://developers.google.com/open-source/licenses/bsd
+-- Copyright 2019 The Chromium Authors
+-- Use of this source code is governed by a BSD-style license that can be
+-- found in the LICENSE file.
 
 -- There have been cases of imported data that used the wrong email
 -- address for a user.  This script can change all the user_ids in our