Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/api/v3/api_proto/feature_objects.proto b/api/v3/api_proto/feature_objects.proto
index 3b2b3b8..dbb1087 100644
--- a/api/v3/api_proto/feature_objects.proto
+++ b/api/v3/api_proto/feature_objects.proto
@@ -1,7 +1,6 @@
-// Copyright 2020 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 2020 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
 // This file defines protobufs for features and related business
 // objects, e.g., hotlists.
@@ -85,4 +84,4 @@
   google.protobuf.Timestamp create_time = 5  [ (google.api.field_behavior) = OUTPUT_ONLY ];
   // User-provided additional details about this item.
   string note = 6;
-}
\ No newline at end of file
+}