Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/mrproto/test/__init__.py b/mrproto/test/__init__.py
new file mode 100644
index 0000000..68130d5
--- /dev/null
+++ b/mrproto/test/__init__.py
@@ -0,0 +1,3 @@
+# 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.