Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/project/project_views.py b/project/project_views.py
index e8698eb..eefea59 100644
--- a/project/project_views.py
+++ b/project/project_views.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.
 
 """View objects to help display projects in EZT."""
 from __future__ import print_function
@@ -19,7 +18,7 @@
 from framework import template_helpers
 from framework import timestr
 from framework import urls
-from proto import project_pb2
+from mrproto import project_pb2
 
 
 class ProjectAccessView(object):