Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/api/features_servicer.py b/api/features_servicer.py
index 589afcb..31ec086 100644
--- a/api/features_servicer.py
+++ b/api/features_servicer.py
@@ -1,7 +1,6 @@
-# Copyright 2018 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 2018 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 from __future__ import print_function
 from __future__ import division
@@ -63,8 +62,8 @@
 
   @monorail_servicer.PRPCMethod
   def ListHotlistsByIssue(self, mc, request):
-    # type: (MonorailConnection, proto.features.ListHotlistsByIssueRequest) ->
-    #     proto.features.ListHotlistsByIssueResponse
+    # type: (MonorailConnection, mrproto.features.ListHotlistsByIssueRequest) ->
+    #     mrproto.features.ListHotlistsByIssueResponse
     """Return the hotlists the given issue is part of."""
     issue_id = converters.IngestIssueRefs(
         mc.cnxn, [request.issue], self.services)[0]