Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/features/notify_reasons.py b/features/notify_reasons.py
index 436f975..1a73918 100644
--- a/features/notify_reasons.py
+++ b/features/notify_reasons.py
@@ -1,7 +1,6 @@
-# Copyright 2017 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 2017 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 """Helper functions for deciding who to notify and why.."""
 from __future__ import print_function
@@ -20,7 +19,7 @@
 from framework import framework_helpers
 from framework import framework_views
 from framework import permissions
-from proto import tracker_pb2
+from mrproto import tracker_pb2
 from search import query2ast
 from search import searchpipeline
 from tracker import component_helpers
@@ -372,9 +371,9 @@
   old_owner_addr_perm_list = ComputeIssueChangeAddressPermList(
       cnxn, old_direct_owners + old_transitive_owners, project, issue,
       services, omit_addrs, users_by_id)
-  owner_addr_perm_set = set(owner_addr_perm_list)
-  old_owner_addr_perm_list = [ap for ap in old_owner_addr_perm_list
-                              if ap not in owner_addr_perm_set]
+  old_owner_addr_perm_list = [
+      ap for ap in old_owner_addr_perm_list if ap not in owner_addr_perm_list
+  ]
   der_owner_addr_perm_list = ComputeIssueChangeAddressPermList(
       cnxn, der_direct_owners + der_transitive_owners, project, issue,
       services, omit_addrs, users_by_id)