Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/features/commitlogcommands.py b/features/commitlogcommands.py
index f570ae3..a48784c 100644
--- a/features/commitlogcommands.py
+++ b/features/commitlogcommands.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.
 
 """Implements processing of issue update command lines.
 
@@ -27,7 +26,7 @@
 from framework import framework_bizobj
 from framework import framework_helpers
 from framework import permissions
-from proto import tracker_pb2
+from mrproto import tracker_pb2
 
 
 # Actions have separate 'Parse' and 'Run' implementations to allow better