Merge branch 'main' into avm99963-monorail

Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e

GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/api/api_proto/users.proto b/api/api_proto/users.proto
index 574dccd..da73b56 100644
--- a/api/api_proto/users.proto
+++ b/api/api_proto/users.proto
@@ -7,6 +7,8 @@
 
 package monorail;
 
+option go_package = "infra/monorailv2/api/api_proto;monorail";
+
 import "api/api_proto/user_objects.proto";
 import "api/api_proto/common.proto";