Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/search/ast2ast.py b/search/ast2ast.py
index bf4de4f..0e1e4cf 100644
--- a/search/ast2ast.py
+++ b/search/ast2ast.py
@@ -1,7 +1,6 @@
-# Copyright 2016 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 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
 
 """Convert a user's issue search AST into a simplified AST.
 
@@ -36,8 +35,8 @@
 import re
 
 from framework import exceptions
-from proto import ast_pb2
-from proto import tracker_pb2
+from mrproto import ast_pb2
+from mrproto import tracker_pb2
 # TODO(jrobbins): if BUILTIN_ISSUE_FIELDS was passed through, I could
 # remove this dep.
 from search import query2ast