Merge branch 'main' into avm99963-monorail

Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e

GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/api/api_proto/users_pb2.py b/api/api_proto/users_pb2.py
index 8d84700..65ab702 100644
--- a/api/api_proto/users_pb2.py
+++ b/api/api_proto/users_pb2.py
@@ -1,8 +1,7 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: api/api_proto/users.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+"""Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
@@ -20,8 +19,9 @@
   name='api/api_proto/users.proto',
   package='monorail',
   syntax='proto3',
-  serialized_options=None,
-  serialized_pb=_b('\n\x19\x61pi/api_proto/users.proto\x12\x08monorail\x1a api/api_proto/user_objects.proto\x1a\x1a\x61pi/api_proto/common.proto\"R\n\x1aListReferencedUsersRequest\x12\x0e\n\x06\x65mails\x18\x02 \x03(\t\x12$\n\tuser_refs\x18\x03 \x03(\x0b\x32\x11.monorail.UserRef\"<\n\x1bListReferencedUsersResponse\x12\x1d\n\x05users\x18\x01 \x03(\x0b\x32\x0e.monorail.User\"5\n\x0eGetUserRequest\x12#\n\x08user_ref\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\"<\n\x15GetMembershipsRequest\x12#\n\x08user_ref\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\"?\n\x16GetMembershipsResponse\x12%\n\ngroup_refs\x18\x01 \x03(\x0b\x32\x11.monorail.UserRef\"=\n\x16GetSavedQueriesRequest\x12#\n\x08user_ref\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\"F\n\x17GetSavedQueriesResponse\x12+\n\rsaved_queries\x18\x01 \x03(\x0b\x32\x14.monorail.SavedQuery\">\n\x17GetUserStarCountRequest\x12#\n\x08user_ref\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\".\n\x18GetUserStarCountResponse\x12\x12\n\nstar_count\x18\x01 \x01(\r\"G\n\x0fStarUserRequest\x12#\n\x08user_ref\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\x12\x0f\n\x07starred\x18\x03 \x01(\x08\"&\n\x10StarUserResponse\x12\x12\n\nstar_count\x18\x01 \x01(\r\"7\n\x1fSetExpandPermsPreferenceRequest\x12\x14\n\x0c\x65xpand_perms\x18\x02 \x01(\x08\"\"\n SetExpandPermsPreferenceResponse\":\n\x13GetUserPrefsRequest\x12#\n\x08user_ref\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\">\n\x14GetUserPrefsResponse\x12&\n\x05prefs\x18\x01 \x03(\x0b\x32\x17.monorail.UserPrefValue\"b\n\x13SetUserPrefsRequest\x12#\n\x08user_ref\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\x12&\n\x05prefs\x18\x03 \x03(\x0b\x32\x17.monorail.UserPrefValue\"\x16\n\x14SetUserPrefsResponse\"*\n\x19InviteLinkedParentRequest\x12\r\n\x05\x65mail\x18\x02 \x01(\t\"\x1c\n\x1aInviteLinkedParentResponse\")\n\x18\x41\x63\x63\x65ptLinkedChildRequest\x12\r\n\x05\x65mail\x18\x02 \x01(\t\"\x1b\n\x19\x41\x63\x63\x65ptLinkedChildResponse\"\\\n\x15UnlinkAccountsRequest\x12!\n\x06parent\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\x12 \n\x05\x63hild\x18\x03 \x01(\x0b\x32\x11.monorail.UserRef\"\x18\n\x16UnlinkAccountsResponse\"?\n\x17GetUsersProjectsRequest\x12$\n\tuser_refs\x18\x01 \x03(\x0b\x32\x11.monorail.UserRef\"J\n\x18GetUsersProjectsResponse\x12.\n\x0eusers_projects\x18\x01 \x03(\x0b\x32\x16.monorail.UserProjects\"#\n\x12\x45xpungeUserRequest\x12\r\n\x05\x65mail\x18\x01 \x01(\t\"\x15\n\x13\x45xpungeUserResponse2\xd3\t\n\x05Users\x12\x35\n\x07GetUser\x12\x18.monorail.GetUserRequest\x1a\x0e.monorail.User\"\x00\x12\x64\n\x13ListReferencedUsers\x12$.monorail.ListReferencedUsersRequest\x1a%.monorail.ListReferencedUsersResponse\"\x00\x12U\n\x0eGetMemberships\x12\x1f.monorail.GetMembershipsRequest\x1a .monorail.GetMembershipsResponse\"\x00\x12X\n\x0fGetSavedQueries\x12 .monorail.GetSavedQueriesRequest\x1a!.monorail.GetSavedQueriesResponse\"\x00\x12[\n\x10GetUserStarCount\x12!.monorail.GetUserStarCountRequest\x1a\".monorail.GetUserStarCountResponse\"\x00\x12\x43\n\x08StarUser\x12\x19.monorail.StarUserRequest\x1a\x1a.monorail.StarUserResponse\"\x00\x12O\n\x0cGetUserPrefs\x12\x1d.monorail.GetUserPrefsRequest\x1a\x1e.monorail.GetUserPrefsResponse\"\x00\x12O\n\x0cSetUserPrefs\x12\x1d.monorail.SetUserPrefsRequest\x1a\x1e.monorail.SetUserPrefsResponse\"\x00\x12s\n\x18SetExpandPermsPreference\x12).monorail.SetExpandPermsPreferenceRequest\x1a*.monorail.SetExpandPermsPreferenceResponse\"\x00\x12\x61\n\x12InviteLinkedParent\x12#.monorail.InviteLinkedParentRequest\x1a$.monorail.InviteLinkedParentResponse\"\x00\x12^\n\x11\x41\x63\x63\x65ptLinkedChild\x12\".monorail.AcceptLinkedChildRequest\x1a#.monorail.AcceptLinkedChildResponse\"\x00\x12U\n\x0eUnlinkAccounts\x12\x1f.monorail.UnlinkAccountsRequest\x1a .monorail.UnlinkAccountsResponse\"\x00\x12[\n\x10GetUsersProjects\x12!.monorail.GetUsersProjectsRequest\x1a\".monorail.GetUsersProjectsResponse\"\x00\x12L\n\x0b\x45xpungeUser\x12\x1c.monorail.ExpungeUserRequest\x1a\x1d.monorail.ExpungeUserResponse\"\x00\x62\x06proto3')
+  serialized_options=b'Z\'infra/monorailv2/api/api_proto;monorail',
+  create_key=_descriptor._internal_create_key,
+  serialized_pb=b'\n\x19\x61pi/api_proto/users.proto\x12\x08monorail\x1a api/api_proto/user_objects.proto\x1a\x1a\x61pi/api_proto/common.proto\"R\n\x1aListReferencedUsersRequest\x12\x0e\n\x06\x65mails\x18\x02 \x03(\t\x12$\n\tuser_refs\x18\x03 \x03(\x0b\x32\x11.monorail.UserRef\"<\n\x1bListReferencedUsersResponse\x12\x1d\n\x05users\x18\x01 \x03(\x0b\x32\x0e.monorail.User\"5\n\x0eGetUserRequest\x12#\n\x08user_ref\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\"<\n\x15GetMembershipsRequest\x12#\n\x08user_ref\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\"?\n\x16GetMembershipsResponse\x12%\n\ngroup_refs\x18\x01 \x03(\x0b\x32\x11.monorail.UserRef\"=\n\x16GetSavedQueriesRequest\x12#\n\x08user_ref\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\"F\n\x17GetSavedQueriesResponse\x12+\n\rsaved_queries\x18\x01 \x03(\x0b\x32\x14.monorail.SavedQuery\">\n\x17GetUserStarCountRequest\x12#\n\x08user_ref\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\".\n\x18GetUserStarCountResponse\x12\x12\n\nstar_count\x18\x01 \x01(\r\"G\n\x0fStarUserRequest\x12#\n\x08user_ref\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\x12\x0f\n\x07starred\x18\x03 \x01(\x08\"&\n\x10StarUserResponse\x12\x12\n\nstar_count\x18\x01 \x01(\r\"7\n\x1fSetExpandPermsPreferenceRequest\x12\x14\n\x0c\x65xpand_perms\x18\x02 \x01(\x08\"\"\n SetExpandPermsPreferenceResponse\":\n\x13GetUserPrefsRequest\x12#\n\x08user_ref\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\">\n\x14GetUserPrefsResponse\x12&\n\x05prefs\x18\x01 \x03(\x0b\x32\x17.monorail.UserPrefValue\"b\n\x13SetUserPrefsRequest\x12#\n\x08user_ref\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\x12&\n\x05prefs\x18\x03 \x03(\x0b\x32\x17.monorail.UserPrefValue\"\x16\n\x14SetUserPrefsResponse\"*\n\x19InviteLinkedParentRequest\x12\r\n\x05\x65mail\x18\x02 \x01(\t\"\x1c\n\x1aInviteLinkedParentResponse\")\n\x18\x41\x63\x63\x65ptLinkedChildRequest\x12\r\n\x05\x65mail\x18\x02 \x01(\t\"\x1b\n\x19\x41\x63\x63\x65ptLinkedChildResponse\"\\\n\x15UnlinkAccountsRequest\x12!\n\x06parent\x18\x02 \x01(\x0b\x32\x11.monorail.UserRef\x12 \n\x05\x63hild\x18\x03 \x01(\x0b\x32\x11.monorail.UserRef\"\x18\n\x16UnlinkAccountsResponse\"?\n\x17GetUsersProjectsRequest\x12$\n\tuser_refs\x18\x01 \x03(\x0b\x32\x11.monorail.UserRef\"J\n\x18GetUsersProjectsResponse\x12.\n\x0eusers_projects\x18\x01 \x03(\x0b\x32\x16.monorail.UserProjects\"#\n\x12\x45xpungeUserRequest\x12\r\n\x05\x65mail\x18\x01 \x01(\t\"\x15\n\x13\x45xpungeUserResponse2\xd3\t\n\x05Users\x12\x35\n\x07GetUser\x12\x18.monorail.GetUserRequest\x1a\x0e.monorail.User\"\x00\x12\x64\n\x13ListReferencedUsers\x12$.monorail.ListReferencedUsersRequest\x1a%.monorail.ListReferencedUsersResponse\"\x00\x12U\n\x0eGetMemberships\x12\x1f.monorail.GetMembershipsRequest\x1a .monorail.GetMembershipsResponse\"\x00\x12X\n\x0fGetSavedQueries\x12 .monorail.GetSavedQueriesRequest\x1a!.monorail.GetSavedQueriesResponse\"\x00\x12[\n\x10GetUserStarCount\x12!.monorail.GetUserStarCountRequest\x1a\".monorail.GetUserStarCountResponse\"\x00\x12\x43\n\x08StarUser\x12\x19.monorail.StarUserRequest\x1a\x1a.monorail.StarUserResponse\"\x00\x12O\n\x0cGetUserPrefs\x12\x1d.monorail.GetUserPrefsRequest\x1a\x1e.monorail.GetUserPrefsResponse\"\x00\x12O\n\x0cSetUserPrefs\x12\x1d.monorail.SetUserPrefsRequest\x1a\x1e.monorail.SetUserPrefsResponse\"\x00\x12s\n\x18SetExpandPermsPreference\x12).monorail.SetExpandPermsPreferenceRequest\x1a*.monorail.SetExpandPermsPreferenceResponse\"\x00\x12\x61\n\x12InviteLinkedParent\x12#.monorail.InviteLinkedParentRequest\x1a$.monorail.InviteLinkedParentResponse\"\x00\x12^\n\x11\x41\x63\x63\x65ptLinkedChild\x12\".monorail.AcceptLinkedChildRequest\x1a#.monorail.AcceptLinkedChildResponse\"\x00\x12U\n\x0eUnlinkAccounts\x12\x1f.monorail.UnlinkAccountsRequest\x1a .monorail.UnlinkAccountsResponse\"\x00\x12[\n\x10GetUsersProjects\x12!.monorail.GetUsersProjectsRequest\x1a\".monorail.GetUsersProjectsResponse\"\x00\x12L\n\x0b\x45xpungeUser\x12\x1c.monorail.ExpungeUserRequest\x1a\x1d.monorail.ExpungeUserResponse\"\x00\x42)Z\'infra/monorailv2/api/api_proto;monorailb\x06proto3'
   ,
   dependencies=[api_dot_api__proto_dot_user__objects__pb2.DESCRIPTOR,api_dot_api__proto_dot_common__pb2.DESCRIPTOR,])
 
@@ -34,6 +34,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='emails', full_name='monorail.ListReferencedUsersRequest.emails', index=0,
@@ -41,14 +42,14 @@
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
     _descriptor.FieldDescriptor(
       name='user_refs', full_name='monorail.ListReferencedUsersRequest.user_refs', index=1,
       number=3, type=11, cpp_type=10, label=3,
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -72,6 +73,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='users', full_name='monorail.ListReferencedUsersResponse.users', index=0,
@@ -79,7 +81,7 @@
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -103,6 +105,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='user_ref', full_name='monorail.GetUserRequest.user_ref', index=0,
@@ -110,7 +113,7 @@
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -134,6 +137,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='user_ref', full_name='monorail.GetMembershipsRequest.user_ref', index=0,
@@ -141,7 +145,7 @@
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -165,6 +169,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='group_refs', full_name='monorail.GetMembershipsResponse.group_refs', index=0,
@@ -172,7 +177,7 @@
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -196,6 +201,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='user_ref', full_name='monorail.GetSavedQueriesRequest.user_ref', index=0,
@@ -203,7 +209,7 @@
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -227,6 +233,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='saved_queries', full_name='monorail.GetSavedQueriesResponse.saved_queries', index=0,
@@ -234,7 +241,7 @@
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -258,6 +265,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='user_ref', full_name='monorail.GetUserStarCountRequest.user_ref', index=0,
@@ -265,7 +273,7 @@
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -289,6 +297,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='star_count', full_name='monorail.GetUserStarCountResponse.star_count', index=0,
@@ -296,7 +305,7 @@
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -320,6 +329,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='user_ref', full_name='monorail.StarUserRequest.user_ref', index=0,
@@ -327,14 +337,14 @@
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
     _descriptor.FieldDescriptor(
       name='starred', full_name='monorail.StarUserRequest.starred', index=1,
       number=3, type=8, cpp_type=7, label=1,
       has_default_value=False, default_value=False,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -358,6 +368,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='star_count', full_name='monorail.StarUserResponse.star_count', index=0,
@@ -365,7 +376,7 @@
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -389,6 +400,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='expand_perms', full_name='monorail.SetExpandPermsPreferenceRequest.expand_perms', index=0,
@@ -396,7 +408,7 @@
       has_default_value=False, default_value=False,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -420,6 +432,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
   ],
   extensions=[
@@ -444,6 +457,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='user_ref', full_name='monorail.GetUserPrefsRequest.user_ref', index=0,
@@ -451,7 +465,7 @@
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -475,6 +489,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='prefs', full_name='monorail.GetUserPrefsResponse.prefs', index=0,
@@ -482,7 +497,7 @@
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -506,6 +521,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='user_ref', full_name='monorail.SetUserPrefsRequest.user_ref', index=0,
@@ -513,14 +529,14 @@
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
     _descriptor.FieldDescriptor(
       name='prefs', full_name='monorail.SetUserPrefsRequest.prefs', index=1,
       number=3, type=11, cpp_type=10, label=3,
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -544,6 +560,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
   ],
   extensions=[
@@ -568,14 +585,15 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='email', full_name='monorail.InviteLinkedParentRequest.email', index=0,
       number=2, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
+      has_default_value=False, default_value=b"".decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -599,6 +617,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
   ],
   extensions=[
@@ -623,14 +642,15 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='email', full_name='monorail.AcceptLinkedChildRequest.email', index=0,
       number=2, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
+      has_default_value=False, default_value=b"".decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -654,6 +674,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
   ],
   extensions=[
@@ -678,6 +699,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='parent', full_name='monorail.UnlinkAccountsRequest.parent', index=0,
@@ -685,14 +707,14 @@
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
     _descriptor.FieldDescriptor(
       name='child', full_name='monorail.UnlinkAccountsRequest.child', index=1,
       number=3, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -716,6 +738,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
   ],
   extensions=[
@@ -740,6 +763,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='user_refs', full_name='monorail.GetUsersProjectsRequest.user_refs', index=0,
@@ -747,7 +771,7 @@
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -771,6 +795,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='users_projects', full_name='monorail.GetUsersProjectsResponse.users_projects', index=0,
@@ -778,7 +803,7 @@
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -802,14 +827,15 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
     _descriptor.FieldDescriptor(
       name='email', full_name='monorail.ExpungeUserRequest.email', index=0,
       number=1, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
+      has_default_value=False, default_value=b"".decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      serialized_options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
   ],
   extensions=[
   ],
@@ -833,6 +859,7 @@
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
+  create_key=_descriptor._internal_create_key,
   fields=[
   ],
   extensions=[
@@ -896,196 +923,197 @@
 DESCRIPTOR.message_types_by_name['ExpungeUserResponse'] = _EXPUNGEUSERRESPONSE
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-ListReferencedUsersRequest = _reflection.GeneratedProtocolMessageType('ListReferencedUsersRequest', (_message.Message,), dict(
-  DESCRIPTOR = _LISTREFERENCEDUSERSREQUEST,
-  __module__ = 'api.api_proto.users_pb2'
+ListReferencedUsersRequest = _reflection.GeneratedProtocolMessageType('ListReferencedUsersRequest', (_message.Message,), {
+  'DESCRIPTOR' : _LISTREFERENCEDUSERSREQUEST,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.ListReferencedUsersRequest)
-  ))
+  })
 _sym_db.RegisterMessage(ListReferencedUsersRequest)
 
-ListReferencedUsersResponse = _reflection.GeneratedProtocolMessageType('ListReferencedUsersResponse', (_message.Message,), dict(
-  DESCRIPTOR = _LISTREFERENCEDUSERSRESPONSE,
-  __module__ = 'api.api_proto.users_pb2'
+ListReferencedUsersResponse = _reflection.GeneratedProtocolMessageType('ListReferencedUsersResponse', (_message.Message,), {
+  'DESCRIPTOR' : _LISTREFERENCEDUSERSRESPONSE,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.ListReferencedUsersResponse)
-  ))
+  })
 _sym_db.RegisterMessage(ListReferencedUsersResponse)
 
-GetUserRequest = _reflection.GeneratedProtocolMessageType('GetUserRequest', (_message.Message,), dict(
-  DESCRIPTOR = _GETUSERREQUEST,
-  __module__ = 'api.api_proto.users_pb2'
+GetUserRequest = _reflection.GeneratedProtocolMessageType('GetUserRequest', (_message.Message,), {
+  'DESCRIPTOR' : _GETUSERREQUEST,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.GetUserRequest)
-  ))
+  })
 _sym_db.RegisterMessage(GetUserRequest)
 
-GetMembershipsRequest = _reflection.GeneratedProtocolMessageType('GetMembershipsRequest', (_message.Message,), dict(
-  DESCRIPTOR = _GETMEMBERSHIPSREQUEST,
-  __module__ = 'api.api_proto.users_pb2'
+GetMembershipsRequest = _reflection.GeneratedProtocolMessageType('GetMembershipsRequest', (_message.Message,), {
+  'DESCRIPTOR' : _GETMEMBERSHIPSREQUEST,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.GetMembershipsRequest)
-  ))
+  })
 _sym_db.RegisterMessage(GetMembershipsRequest)
 
-GetMembershipsResponse = _reflection.GeneratedProtocolMessageType('GetMembershipsResponse', (_message.Message,), dict(
-  DESCRIPTOR = _GETMEMBERSHIPSRESPONSE,
-  __module__ = 'api.api_proto.users_pb2'
+GetMembershipsResponse = _reflection.GeneratedProtocolMessageType('GetMembershipsResponse', (_message.Message,), {
+  'DESCRIPTOR' : _GETMEMBERSHIPSRESPONSE,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.GetMembershipsResponse)
-  ))
+  })
 _sym_db.RegisterMessage(GetMembershipsResponse)
 
-GetSavedQueriesRequest = _reflection.GeneratedProtocolMessageType('GetSavedQueriesRequest', (_message.Message,), dict(
-  DESCRIPTOR = _GETSAVEDQUERIESREQUEST,
-  __module__ = 'api.api_proto.users_pb2'
+GetSavedQueriesRequest = _reflection.GeneratedProtocolMessageType('GetSavedQueriesRequest', (_message.Message,), {
+  'DESCRIPTOR' : _GETSAVEDQUERIESREQUEST,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.GetSavedQueriesRequest)
-  ))
+  })
 _sym_db.RegisterMessage(GetSavedQueriesRequest)
 
-GetSavedQueriesResponse = _reflection.GeneratedProtocolMessageType('GetSavedQueriesResponse', (_message.Message,), dict(
-  DESCRIPTOR = _GETSAVEDQUERIESRESPONSE,
-  __module__ = 'api.api_proto.users_pb2'
+GetSavedQueriesResponse = _reflection.GeneratedProtocolMessageType('GetSavedQueriesResponse', (_message.Message,), {
+  'DESCRIPTOR' : _GETSAVEDQUERIESRESPONSE,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.GetSavedQueriesResponse)
-  ))
+  })
 _sym_db.RegisterMessage(GetSavedQueriesResponse)
 
-GetUserStarCountRequest = _reflection.GeneratedProtocolMessageType('GetUserStarCountRequest', (_message.Message,), dict(
-  DESCRIPTOR = _GETUSERSTARCOUNTREQUEST,
-  __module__ = 'api.api_proto.users_pb2'
+GetUserStarCountRequest = _reflection.GeneratedProtocolMessageType('GetUserStarCountRequest', (_message.Message,), {
+  'DESCRIPTOR' : _GETUSERSTARCOUNTREQUEST,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.GetUserStarCountRequest)
-  ))
+  })
 _sym_db.RegisterMessage(GetUserStarCountRequest)
 
-GetUserStarCountResponse = _reflection.GeneratedProtocolMessageType('GetUserStarCountResponse', (_message.Message,), dict(
-  DESCRIPTOR = _GETUSERSTARCOUNTRESPONSE,
-  __module__ = 'api.api_proto.users_pb2'
+GetUserStarCountResponse = _reflection.GeneratedProtocolMessageType('GetUserStarCountResponse', (_message.Message,), {
+  'DESCRIPTOR' : _GETUSERSTARCOUNTRESPONSE,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.GetUserStarCountResponse)
-  ))
+  })
 _sym_db.RegisterMessage(GetUserStarCountResponse)
 
-StarUserRequest = _reflection.GeneratedProtocolMessageType('StarUserRequest', (_message.Message,), dict(
-  DESCRIPTOR = _STARUSERREQUEST,
-  __module__ = 'api.api_proto.users_pb2'
+StarUserRequest = _reflection.GeneratedProtocolMessageType('StarUserRequest', (_message.Message,), {
+  'DESCRIPTOR' : _STARUSERREQUEST,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.StarUserRequest)
-  ))
+  })
 _sym_db.RegisterMessage(StarUserRequest)
 
-StarUserResponse = _reflection.GeneratedProtocolMessageType('StarUserResponse', (_message.Message,), dict(
-  DESCRIPTOR = _STARUSERRESPONSE,
-  __module__ = 'api.api_proto.users_pb2'
+StarUserResponse = _reflection.GeneratedProtocolMessageType('StarUserResponse', (_message.Message,), {
+  'DESCRIPTOR' : _STARUSERRESPONSE,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.StarUserResponse)
-  ))
+  })
 _sym_db.RegisterMessage(StarUserResponse)
 
-SetExpandPermsPreferenceRequest = _reflection.GeneratedProtocolMessageType('SetExpandPermsPreferenceRequest', (_message.Message,), dict(
-  DESCRIPTOR = _SETEXPANDPERMSPREFERENCEREQUEST,
-  __module__ = 'api.api_proto.users_pb2'
+SetExpandPermsPreferenceRequest = _reflection.GeneratedProtocolMessageType('SetExpandPermsPreferenceRequest', (_message.Message,), {
+  'DESCRIPTOR' : _SETEXPANDPERMSPREFERENCEREQUEST,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.SetExpandPermsPreferenceRequest)
-  ))
+  })
 _sym_db.RegisterMessage(SetExpandPermsPreferenceRequest)
 
-SetExpandPermsPreferenceResponse = _reflection.GeneratedProtocolMessageType('SetExpandPermsPreferenceResponse', (_message.Message,), dict(
-  DESCRIPTOR = _SETEXPANDPERMSPREFERENCERESPONSE,
-  __module__ = 'api.api_proto.users_pb2'
+SetExpandPermsPreferenceResponse = _reflection.GeneratedProtocolMessageType('SetExpandPermsPreferenceResponse', (_message.Message,), {
+  'DESCRIPTOR' : _SETEXPANDPERMSPREFERENCERESPONSE,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.SetExpandPermsPreferenceResponse)
-  ))
+  })
 _sym_db.RegisterMessage(SetExpandPermsPreferenceResponse)
 
-GetUserPrefsRequest = _reflection.GeneratedProtocolMessageType('GetUserPrefsRequest', (_message.Message,), dict(
-  DESCRIPTOR = _GETUSERPREFSREQUEST,
-  __module__ = 'api.api_proto.users_pb2'
+GetUserPrefsRequest = _reflection.GeneratedProtocolMessageType('GetUserPrefsRequest', (_message.Message,), {
+  'DESCRIPTOR' : _GETUSERPREFSREQUEST,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.GetUserPrefsRequest)
-  ))
+  })
 _sym_db.RegisterMessage(GetUserPrefsRequest)
 
-GetUserPrefsResponse = _reflection.GeneratedProtocolMessageType('GetUserPrefsResponse', (_message.Message,), dict(
-  DESCRIPTOR = _GETUSERPREFSRESPONSE,
-  __module__ = 'api.api_proto.users_pb2'
+GetUserPrefsResponse = _reflection.GeneratedProtocolMessageType('GetUserPrefsResponse', (_message.Message,), {
+  'DESCRIPTOR' : _GETUSERPREFSRESPONSE,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.GetUserPrefsResponse)
-  ))
+  })
 _sym_db.RegisterMessage(GetUserPrefsResponse)
 
-SetUserPrefsRequest = _reflection.GeneratedProtocolMessageType('SetUserPrefsRequest', (_message.Message,), dict(
-  DESCRIPTOR = _SETUSERPREFSREQUEST,
-  __module__ = 'api.api_proto.users_pb2'
+SetUserPrefsRequest = _reflection.GeneratedProtocolMessageType('SetUserPrefsRequest', (_message.Message,), {
+  'DESCRIPTOR' : _SETUSERPREFSREQUEST,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.SetUserPrefsRequest)
-  ))
+  })
 _sym_db.RegisterMessage(SetUserPrefsRequest)
 
-SetUserPrefsResponse = _reflection.GeneratedProtocolMessageType('SetUserPrefsResponse', (_message.Message,), dict(
-  DESCRIPTOR = _SETUSERPREFSRESPONSE,
-  __module__ = 'api.api_proto.users_pb2'
+SetUserPrefsResponse = _reflection.GeneratedProtocolMessageType('SetUserPrefsResponse', (_message.Message,), {
+  'DESCRIPTOR' : _SETUSERPREFSRESPONSE,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.SetUserPrefsResponse)
-  ))
+  })
 _sym_db.RegisterMessage(SetUserPrefsResponse)
 
-InviteLinkedParentRequest = _reflection.GeneratedProtocolMessageType('InviteLinkedParentRequest', (_message.Message,), dict(
-  DESCRIPTOR = _INVITELINKEDPARENTREQUEST,
-  __module__ = 'api.api_proto.users_pb2'
+InviteLinkedParentRequest = _reflection.GeneratedProtocolMessageType('InviteLinkedParentRequest', (_message.Message,), {
+  'DESCRIPTOR' : _INVITELINKEDPARENTREQUEST,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.InviteLinkedParentRequest)
-  ))
+  })
 _sym_db.RegisterMessage(InviteLinkedParentRequest)
 
-InviteLinkedParentResponse = _reflection.GeneratedProtocolMessageType('InviteLinkedParentResponse', (_message.Message,), dict(
-  DESCRIPTOR = _INVITELINKEDPARENTRESPONSE,
-  __module__ = 'api.api_proto.users_pb2'
+InviteLinkedParentResponse = _reflection.GeneratedProtocolMessageType('InviteLinkedParentResponse', (_message.Message,), {
+  'DESCRIPTOR' : _INVITELINKEDPARENTRESPONSE,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.InviteLinkedParentResponse)
-  ))
+  })
 _sym_db.RegisterMessage(InviteLinkedParentResponse)
 
-AcceptLinkedChildRequest = _reflection.GeneratedProtocolMessageType('AcceptLinkedChildRequest', (_message.Message,), dict(
-  DESCRIPTOR = _ACCEPTLINKEDCHILDREQUEST,
-  __module__ = 'api.api_proto.users_pb2'
+AcceptLinkedChildRequest = _reflection.GeneratedProtocolMessageType('AcceptLinkedChildRequest', (_message.Message,), {
+  'DESCRIPTOR' : _ACCEPTLINKEDCHILDREQUEST,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.AcceptLinkedChildRequest)
-  ))
+  })
 _sym_db.RegisterMessage(AcceptLinkedChildRequest)
 
-AcceptLinkedChildResponse = _reflection.GeneratedProtocolMessageType('AcceptLinkedChildResponse', (_message.Message,), dict(
-  DESCRIPTOR = _ACCEPTLINKEDCHILDRESPONSE,
-  __module__ = 'api.api_proto.users_pb2'
+AcceptLinkedChildResponse = _reflection.GeneratedProtocolMessageType('AcceptLinkedChildResponse', (_message.Message,), {
+  'DESCRIPTOR' : _ACCEPTLINKEDCHILDRESPONSE,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.AcceptLinkedChildResponse)
-  ))
+  })
 _sym_db.RegisterMessage(AcceptLinkedChildResponse)
 
-UnlinkAccountsRequest = _reflection.GeneratedProtocolMessageType('UnlinkAccountsRequest', (_message.Message,), dict(
-  DESCRIPTOR = _UNLINKACCOUNTSREQUEST,
-  __module__ = 'api.api_proto.users_pb2'
+UnlinkAccountsRequest = _reflection.GeneratedProtocolMessageType('UnlinkAccountsRequest', (_message.Message,), {
+  'DESCRIPTOR' : _UNLINKACCOUNTSREQUEST,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.UnlinkAccountsRequest)
-  ))
+  })
 _sym_db.RegisterMessage(UnlinkAccountsRequest)
 
-UnlinkAccountsResponse = _reflection.GeneratedProtocolMessageType('UnlinkAccountsResponse', (_message.Message,), dict(
-  DESCRIPTOR = _UNLINKACCOUNTSRESPONSE,
-  __module__ = 'api.api_proto.users_pb2'
+UnlinkAccountsResponse = _reflection.GeneratedProtocolMessageType('UnlinkAccountsResponse', (_message.Message,), {
+  'DESCRIPTOR' : _UNLINKACCOUNTSRESPONSE,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.UnlinkAccountsResponse)
-  ))
+  })
 _sym_db.RegisterMessage(UnlinkAccountsResponse)
 
-GetUsersProjectsRequest = _reflection.GeneratedProtocolMessageType('GetUsersProjectsRequest', (_message.Message,), dict(
-  DESCRIPTOR = _GETUSERSPROJECTSREQUEST,
-  __module__ = 'api.api_proto.users_pb2'
+GetUsersProjectsRequest = _reflection.GeneratedProtocolMessageType('GetUsersProjectsRequest', (_message.Message,), {
+  'DESCRIPTOR' : _GETUSERSPROJECTSREQUEST,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.GetUsersProjectsRequest)
-  ))
+  })
 _sym_db.RegisterMessage(GetUsersProjectsRequest)
 
-GetUsersProjectsResponse = _reflection.GeneratedProtocolMessageType('GetUsersProjectsResponse', (_message.Message,), dict(
-  DESCRIPTOR = _GETUSERSPROJECTSRESPONSE,
-  __module__ = 'api.api_proto.users_pb2'
+GetUsersProjectsResponse = _reflection.GeneratedProtocolMessageType('GetUsersProjectsResponse', (_message.Message,), {
+  'DESCRIPTOR' : _GETUSERSPROJECTSRESPONSE,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.GetUsersProjectsResponse)
-  ))
+  })
 _sym_db.RegisterMessage(GetUsersProjectsResponse)
 
-ExpungeUserRequest = _reflection.GeneratedProtocolMessageType('ExpungeUserRequest', (_message.Message,), dict(
-  DESCRIPTOR = _EXPUNGEUSERREQUEST,
-  __module__ = 'api.api_proto.users_pb2'
+ExpungeUserRequest = _reflection.GeneratedProtocolMessageType('ExpungeUserRequest', (_message.Message,), {
+  'DESCRIPTOR' : _EXPUNGEUSERREQUEST,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.ExpungeUserRequest)
-  ))
+  })
 _sym_db.RegisterMessage(ExpungeUserRequest)
 
-ExpungeUserResponse = _reflection.GeneratedProtocolMessageType('ExpungeUserResponse', (_message.Message,), dict(
-  DESCRIPTOR = _EXPUNGEUSERRESPONSE,
-  __module__ = 'api.api_proto.users_pb2'
+ExpungeUserResponse = _reflection.GeneratedProtocolMessageType('ExpungeUserResponse', (_message.Message,), {
+  'DESCRIPTOR' : _EXPUNGEUSERRESPONSE,
+  '__module__' : 'api.api_proto.users_pb2'
   # @@protoc_insertion_point(class_scope:monorail.ExpungeUserResponse)
-  ))
+  })
 _sym_db.RegisterMessage(ExpungeUserResponse)
 
 
+DESCRIPTOR._options = None
 
 _USERS = _descriptor.ServiceDescriptor(
   name='Users',
@@ -1093,6 +1121,7 @@
   file=DESCRIPTOR,
   index=0,
   serialized_options=None,
+  create_key=_descriptor._internal_create_key,
   serialized_start=1598,
   serialized_end=2833,
   methods=[
@@ -1104,6 +1133,7 @@
     input_type=_GETUSERREQUEST,
     output_type=api_dot_api__proto_dot_user__objects__pb2._USER,
     serialized_options=None,
+    create_key=_descriptor._internal_create_key,
   ),
   _descriptor.MethodDescriptor(
     name='ListReferencedUsers',
@@ -1113,6 +1143,7 @@
     input_type=_LISTREFERENCEDUSERSREQUEST,
     output_type=_LISTREFERENCEDUSERSRESPONSE,
     serialized_options=None,
+    create_key=_descriptor._internal_create_key,
   ),
   _descriptor.MethodDescriptor(
     name='GetMemberships',
@@ -1122,6 +1153,7 @@
     input_type=_GETMEMBERSHIPSREQUEST,
     output_type=_GETMEMBERSHIPSRESPONSE,
     serialized_options=None,
+    create_key=_descriptor._internal_create_key,
   ),
   _descriptor.MethodDescriptor(
     name='GetSavedQueries',
@@ -1131,6 +1163,7 @@
     input_type=_GETSAVEDQUERIESREQUEST,
     output_type=_GETSAVEDQUERIESRESPONSE,
     serialized_options=None,
+    create_key=_descriptor._internal_create_key,
   ),
   _descriptor.MethodDescriptor(
     name='GetUserStarCount',
@@ -1140,6 +1173,7 @@
     input_type=_GETUSERSTARCOUNTREQUEST,
     output_type=_GETUSERSTARCOUNTRESPONSE,
     serialized_options=None,
+    create_key=_descriptor._internal_create_key,
   ),
   _descriptor.MethodDescriptor(
     name='StarUser',
@@ -1149,6 +1183,7 @@
     input_type=_STARUSERREQUEST,
     output_type=_STARUSERRESPONSE,
     serialized_options=None,
+    create_key=_descriptor._internal_create_key,
   ),
   _descriptor.MethodDescriptor(
     name='GetUserPrefs',
@@ -1158,6 +1193,7 @@
     input_type=_GETUSERPREFSREQUEST,
     output_type=_GETUSERPREFSRESPONSE,
     serialized_options=None,
+    create_key=_descriptor._internal_create_key,
   ),
   _descriptor.MethodDescriptor(
     name='SetUserPrefs',
@@ -1167,6 +1203,7 @@
     input_type=_SETUSERPREFSREQUEST,
     output_type=_SETUSERPREFSRESPONSE,
     serialized_options=None,
+    create_key=_descriptor._internal_create_key,
   ),
   _descriptor.MethodDescriptor(
     name='SetExpandPermsPreference',
@@ -1176,6 +1213,7 @@
     input_type=_SETEXPANDPERMSPREFERENCEREQUEST,
     output_type=_SETEXPANDPERMSPREFERENCERESPONSE,
     serialized_options=None,
+    create_key=_descriptor._internal_create_key,
   ),
   _descriptor.MethodDescriptor(
     name='InviteLinkedParent',
@@ -1185,6 +1223,7 @@
     input_type=_INVITELINKEDPARENTREQUEST,
     output_type=_INVITELINKEDPARENTRESPONSE,
     serialized_options=None,
+    create_key=_descriptor._internal_create_key,
   ),
   _descriptor.MethodDescriptor(
     name='AcceptLinkedChild',
@@ -1194,6 +1233,7 @@
     input_type=_ACCEPTLINKEDCHILDREQUEST,
     output_type=_ACCEPTLINKEDCHILDRESPONSE,
     serialized_options=None,
+    create_key=_descriptor._internal_create_key,
   ),
   _descriptor.MethodDescriptor(
     name='UnlinkAccounts',
@@ -1203,6 +1243,7 @@
     input_type=_UNLINKACCOUNTSREQUEST,
     output_type=_UNLINKACCOUNTSRESPONSE,
     serialized_options=None,
+    create_key=_descriptor._internal_create_key,
   ),
   _descriptor.MethodDescriptor(
     name='GetUsersProjects',
@@ -1212,6 +1253,7 @@
     input_type=_GETUSERSPROJECTSREQUEST,
     output_type=_GETUSERSPROJECTSRESPONSE,
     serialized_options=None,
+    create_key=_descriptor._internal_create_key,
   ),
   _descriptor.MethodDescriptor(
     name='ExpungeUser',
@@ -1221,6 +1263,7 @@
     input_type=_EXPUNGEUSERREQUEST,
     output_type=_EXPUNGEUSERRESPONSE,
     serialized_options=None,
+    create_key=_descriptor._internal_create_key,
   ),
 ])
 _sym_db.RegisterServiceDescriptor(_USERS)