diff --git a/.travis.yml b/.travis.yml
index e9f44f702b2..58e4772f3ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ cache:
   directories:
   - $HOME/local
 before_install:
-- ./.travis.build-protoc.sh 3.0.0-beta-1
+- ./.travis.build-protoc.sh 3.0.0-beta-2
 - go get github.com/golang/lint/golint
 install:
 - go get github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway
diff --git a/examples/examplepb/a_bit_of_everything.pb.go b/examples/examplepb/a_bit_of_everything.pb.go
index 7b0e95cb069..9de17af4635 100644
--- a/examples/examplepb/a_bit_of_everything.pb.go
+++ b/examples/examplepb/a_bit_of_everything.pb.go
@@ -477,52 +477,56 @@ var _ABitOfEverythingService_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor1 = []byte{
-	// 743 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xc4, 0x56, 0xcf, 0x6a, 0x13, 0x5f,
-	0x14, 0x66, 0x92, 0x74, 0xda, 0xdc, 0xb4, 0x69, 0x7a, 0x7f, 0x7f, 0x6c, 0x83, 0x60, 0x1d, 0x6a,
-	0xad, 0xb1, 0xcc, 0x6d, 0x53, 0x51, 0x28, 0x28, 0x18, 0xed, 0x42, 0xa8, 0x75, 0x51, 0xdc, 0x14,
-	0x24, 0xdc, 0xc9, 0xdc, 0x4c, 0x87, 0x4e, 0xe6, 0x0e, 0x33, 0x77, 0x62, 0x43, 0xc8, 0xc6, 0x95,
-	0x20, 0x28, 0xe8, 0x03, 0xb8, 0x70, 0xa5, 0xe0, 0x93, 0x88, 0x2b, 0x5f, 0xc1, 0x07, 0xf1, 0xcc,
-	0xcd, 0x64, 0x3a, 0x89, 0x62, 0xd2, 0x08, 0x75, 0x97, 0xf3, 0x9d, 0x7f, 0x5f, 0xce, 0x77, 0xee,
-	0x49, 0xd0, 0x26, 0x3b, 0xa5, 0x2d, 0xcf, 0x61, 0x01, 0x89, 0x3f, 0x78, 0x06, 0xa1, 0x75, 0xc3,
-	0x16, 0x75, 0xde, 0xac, 0xb3, 0x36, 0xf3, 0x3b, 0xe2, 0xd8, 0x76, 0x2d, 0xdd, 0xf3, 0xb9, 0xe0,
-	0xf8, 0x9a, 0xc5, 0x5c, 0x8b, 0xeb, 0x96, 0xef, 0x35, 0x74, 0x8b, 0x0a, 0xf6, 0x9c, 0x76, 0xf4,
-	0x41, 0x01, 0x3d, 0x29, 0x50, 0xbe, 0x6c, 0x71, 0x6e, 0x39, 0x8c, 0x50, 0xcf, 0x26, 0xd4, 0x75,
-	0xb9, 0xa0, 0xc2, 0xe6, 0x6e, 0xd0, 0x2f, 0x52, 0x2e, 0x27, 0x2d, 0x83, 0xd0, 0x20, 0x2d, 0x16,
-	0x04, 0xd4, 0x62, 0x7d, 0x9f, 0xf6, 0x35, 0x8b, 0x4a, 0xf7, 0x6b, 0xb6, 0x78, 0xd2, 0xdc, 0x4b,
-	0x7a, 0xe3, 0x79, 0x94, 0x0b, 0x43, 0xdb, 0x5c, 0x56, 0x56, 0x95, 0x8d, 0x3c, 0x3e, 0x40, 0xaa,
-	0xcb, 0x02, 0xc1, 0xcc, 0xe5, 0xcc, 0x6a, 0x76, 0xa3, 0x50, 0xbd, 0xa7, 0x4f, 0x44, 0x4a, 0x1f,
-	0x2d, 0xab, 0x1f, 0xc8, 0x2a, 0xf8, 0x1f, 0x54, 0x68, 0x3a, 0x9c, 0x8a, 0x7a, 0x9b, 0x3a, 0x21,
-	0x5b, 0xce, 0x42, 0x93, 0x0c, 0xfe, 0x17, 0xcd, 0x9b, 0x3c, 0x34, 0x1c, 0x16, 0xa3, 0x39, 0x40,
-	0x95, 0x28, 0xd4, 0x76, 0xc5, 0xed, 0x5b, 0x31, 0x38, 0x03, 0x60, 0x36, 0x0a, 0x0d, 0xd3, 0xa8,
-	0x0a, 0x68, 0x2e, 0x0e, 0xdd, 0xa9, 0xc6, 0xe0, 0x2c, 0x80, 0x33, 0xf8, 0x3f, 0xb4, 0xd0, 0xb4,
-	0x4f, 0x99, 0x99, 0xc4, 0xce, 0x01, 0xac, 0x26, 0x70, 0x12, 0x9d, 0x07, 0x78, 0x16, 0x63, 0x84,
-	0x0c, 0xce, 0x9d, 0x18, 0x43, 0x80, 0xcd, 0x45, 0xcd, 0x02, 0xe1, 0x03, 0xfb, 0x18, 0x2d, 0xc8,
-	0x91, 0xc4, 0x14, 0x92, 0xfc, 0x05, 0x40, 0x17, 0xf0, 0xff, 0xa8, 0x18, 0x0c, 0xd7, 0x5d, 0x04,
-	0x7c, 0xf1, 0x0c, 0x4f, 0x68, 0x94, 0x00, 0x2f, 0xc9, 0xda, 0xe9, 0x2a, 0x4b, 0x80, 0x2e, 0x0d,
-	0xd0, 0x24, 0x16, 0x03, 0x8a, 0xcb, 0xeb, 0x48, 0x8d, 0xc7, 0x07, 0xe2, 0xb8, 0xb4, 0xc5, 0x62,
-	0x71, 0x8a, 0x48, 0xa5, 0x2d, 0x1e, 0xba, 0x02, 0xc4, 0x01, 0x0e, 0x5a, 0x11, 0xcd, 0xef, 0xb5,
-	0x3c, 0xd1, 0x79, 0xdc, 0x57, 0x59, 0x5b, 0x41, 0xf9, 0x47, 0x66, 0x6c, 0x0c, 0xeb, 0x5a, 0x7d,
-	0x5d, 0x44, 0x97, 0x46, 0x35, 0x3a, 0x64, 0x7e, 0xdb, 0x6e, 0x30, 0xfc, 0x26, 0x8b, 0xd4, 0x07,
-	0x3e, 0x03, 0x71, 0xf1, 0x9d, 0x29, 0xe5, 0x2e, 0x4f, 0x9b, 0xa8, 0xbd, 0xcd, 0xbc, 0xf8, 0xf6,
-	0xfd, 0x5d, 0xe6, 0x55, 0x46, 0x7b, 0x99, 0x21, 0xed, 0xed, 0xc1, 0x43, 0xf9, 0xd5, 0x33, 0x21,
-	0xdd, 0xd4, 0x2a, 0xf5, 0x48, 0x37, 0xbd, 0x43, 0x60, 0xa6, 0xe6, 0xd8, 0x23, 0x01, 0xf3, 0xa8,
-	0x4f, 0x05, 0xf7, 0x49, 0x37, 0x1c, 0x72, 0x74, 0x53, 0x22, 0x80, 0x35, 0x24, 0xd5, 0xc0, 0x4e,
-	0xf9, 0xcf, 0x76, 0x04, 0x8c, 0xf4, 0x72, 0xdc, 0x05, 0xc3, 0xf3, 0x19, 0xc4, 0x93, 0x4a, 0xaf,
-	0xdf, 0x24, 0x95, 0x16, 0x8c, 0xd6, 0x09, 0x46, 0x1b, 0x05, 0x23, 0x09, 0x69, 0x92, 0xf8, 0x93,
-	0x82, 0x50, 0x5f, 0x91, 0x1a, 0x37, 0x3b, 0x7f, 0x41, 0x95, 0x8a, 0x14, 0x65, 0x4d, 0xbb, 0x32,
-	0x46, 0x92, 0x5d, 0xa5, 0x82, 0x3f, 0x03, 0xd9, 0x5a, 0xe8, 0x9c, 0xfc, 0xe9, 0x0a, 0xed, 0x4c,
-	0x98, 0x38, 0xb4, 0xf2, 0x44, 0x12, 0xbd, 0xa1, 0xad, 0x8d, 0xdb, 0x1d, 0x03, 0x18, 0x02, 0x5b,
-	0xb8, 0x33, 0x1f, 0x14, 0xa4, 0xee, 0x73, 0x7e, 0x12, 0x7a, 0x78, 0x6b, 0xc2, 0x96, 0xc9, 0xab,
-	0x9a, 0x7e, 0xa2, 0xba, 0x24, 0xba, 0x81, 0xd7, 0xc7, 0x2e, 0x79, 0xf4, 0x6a, 0x7b, 0xf8, 0xbd,
-	0x82, 0x72, 0xfb, 0x76, 0x20, 0xf0, 0x34, 0x63, 0x99, 0x9e, 0xe6, 0x75, 0x49, 0xf3, 0x2a, 0x1e,
-	0x27, 0xfc, 0x96, 0x82, 0x3f, 0xc2, 0x1c, 0x9f, 0x7a, 0xe6, 0xc5, 0x6b, 0xbe, 0x2d, 0x39, 0xde,
-	0x2c, 0x4f, 0x38, 0xca, 0x68, 0x47, 0x61, 0x9a, 0xea, 0x43, 0xe6, 0x30, 0xe0, 0x7a, 0x7e, 0xcd,
-	0xa7, 0x22, 0x19, 0xeb, 0x5d, 0x99, 0x54, 0xef, 0x2f, 0xa0, 0xf7, 0x5e, 0xe3, 0x98, 0x63, 0xfd,
-	0xb7, 0xdd, 0xe0, 0x47, 0x5d, 0x3f, 0x94, 0x67, 0x68, 0xc0, 0xee, 0x9c, 0xf1, 0x5a, 0x43, 0x12,
-	0x7b, 0x86, 0x37, 0xc7, 0x11, 0x63, 0xc0, 0x86, 0x74, 0xfb, 0x17, 0xe9, 0x68, 0x45, 0x2b, 0x91,
-	0x76, 0x35, 0x89, 0x8f, 0x7c, 0xbb, 0x33, 0xd2, 0x77, 0x84, 0xf1, 0x4f, 0xae, 0x68, 0xde, 0x73,
-	0xd1, 0x4d, 0xb8, 0x90, 0x6f, 0x34, 0xf1, 0x0d, 0x90, 0xac, 0xa3, 0x1b, 0xb0, 0xa5, 0xd4, 0x0a,
-	0x47, 0xf9, 0x44, 0x39, 0x43, 0x95, 0xff, 0x8f, 0x76, 0x7e, 0x04, 0x00, 0x00, 0xff, 0xff, 0x14,
-	0xd8, 0xa5, 0xb8, 0xb0, 0x09, 0x00, 0x00,
+	// 816 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xc4, 0x96, 0x5d, 0x6b, 0x13, 0x4d,
+	0x14, 0xc7, 0xd9, 0xbc, 0x6c, 0x9b, 0x49, 0xd3, 0xa6, 0x73, 0xf1, 0x3c, 0x7d, 0xc2, 0x23, 0x6d,
+	0xd7, 0x56, 0x63, 0x2c, 0xbb, 0x6d, 0x52, 0x14, 0x0a, 0x0a, 0x46, 0x7b, 0x21, 0x54, 0x85, 0x2d,
+	0xf6, 0xa2, 0x20, 0x61, 0x93, 0x4c, 0xb6, 0x4b, 0x37, 0x3b, 0xcb, 0xee, 0x6c, 0x6c, 0x08, 0xb9,
+	0xf1, 0x4a, 0x10, 0x14, 0xf4, 0x03, 0x28, 0x78, 0xa5, 0xe0, 0x27, 0xf1, 0xd2, 0xaf, 0xe0, 0x07,
+	0xf1, 0xec, 0xec, 0x8b, 0x9b, 0x58, 0x4c, 0x1a, 0xa1, 0xde, 0xed, 0xcc, 0xfc, 0xe6, 0x7f, 0xfe,
+	0x73, 0xce, 0x99, 0x61, 0xd1, 0x16, 0x39, 0xd3, 0xba, 0xb6, 0x49, 0x5c, 0x25, 0xfc, 0xb0, 0x9b,
+	0x8a, 0xd6, 0x68, 0x1a, 0xac, 0x41, 0x3b, 0x0d, 0xd2, 0x23, 0x4e, 0x9f, 0x9d, 0x18, 0x96, 0x2e,
+	0xdb, 0x0e, 0x65, 0x14, 0x6f, 0xea, 0xc4, 0xd2, 0xa9, 0xac, 0x3b, 0x76, 0x4b, 0xd6, 0x35, 0x46,
+	0x9e, 0x6b, 0x7d, 0x39, 0x12, 0x90, 0x63, 0x81, 0xd2, 0xff, 0x3a, 0xa5, 0xba, 0x49, 0x14, 0xcd,
+	0x36, 0x14, 0xcd, 0xb2, 0x28, 0xd3, 0x98, 0x41, 0x2d, 0x37, 0x10, 0x29, 0x95, 0xe2, 0x90, 0xae,
+	0xd7, 0x54, 0xba, 0xc4, 0x75, 0x35, 0x9d, 0x04, 0x6b, 0xd2, 0x87, 0x2c, 0x2a, 0xde, 0xab, 0x1b,
+	0xec, 0x49, 0x67, 0x3f, 0x8e, 0x8d, 0x31, 0xca, 0x78, 0x9e, 0xd1, 0x5e, 0x11, 0xd6, 0x84, 0x72,
+	0x4e, 0xe5, 0xdf, 0xf8, 0x08, 0x89, 0x16, 0x71, 0x19, 0x69, 0xaf, 0xa4, 0xd6, 0xd2, 0xe5, 0x7c,
+	0xf5, 0xae, 0x3c, 0x95, 0x35, 0x79, 0x5c, 0x5c, 0x7e, 0xcc, 0x55, 0xd4, 0x50, 0x0d, 0xaf, 0xa2,
+	0x7c, 0xc7, 0xa4, 0x1a, 0x6b, 0xf4, 0x34, 0xd3, 0x23, 0x2b, 0x69, 0x08, 0x99, 0x52, 0x11, 0x9f,
+	0x3a, 0xf2, 0x67, 0xf0, 0x3a, 0x5a, 0x68, 0x53, 0xaf, 0x69, 0x92, 0x90, 0xc8, 0x00, 0x21, 0xa8,
+	0xf9, 0x60, 0x2e, 0x40, 0x40, 0xc3, 0xb0, 0xd8, 0xad, 0xdd, 0x90, 0xc8, 0x02, 0x91, 0x56, 0x11,
+	0x9f, 0x8a, 0x35, 0xbc, 0x24, 0x21, 0x02, 0x91, 0x51, 0xf3, 0x5e, 0x02, 0x09, 0x34, 0x6a, 0xd5,
+	0x90, 0x98, 0x03, 0x22, 0xcb, 0x35, 0x6a, 0xd5, 0x00, 0xb8, 0x8a, 0x0a, 0x1d, 0xe3, 0x8c, 0xb4,
+	0x63, 0x91, 0x79, 0x40, 0x44, 0x75, 0x21, 0x9c, 0x1c, 0x85, 0x62, 0x9d, 0x1c, 0x40, 0x73, 0x21,
+	0x14, 0x29, 0x5d, 0x41, 0xa8, 0x49, 0xa9, 0x19, 0x12, 0x08, 0x88, 0x79, 0x35, 0xe7, 0xcf, 0xc4,
+	0x66, 0x5d, 0xe6, 0x40, 0xaa, 0x42, 0x20, 0xcf, 0xab, 0x90, 0x0f, 0xe6, 0x46, 0xce, 0x13, 0x47,
+	0x29, 0x00, 0x52, 0x08, 0xce, 0x13, 0x05, 0xd9, 0x44, 0x8b, 0xee, 0xa8, 0x95, 0x25, 0x80, 0x96,
+	0xd4, 0x82, 0x3b, 0xe2, 0x25, 0xc6, 0xe2, 0x63, 0x15, 0x01, 0x2b, 0x46, 0x58, 0x22, 0x81, 0x6e,
+	0x32, 0xe0, 0x32, 0x40, 0xcb, 0xe0, 0x29, 0x11, 0x30, 0x44, 0x62, 0x1d, 0x0c, 0x08, 0x0e, 0x90,
+	0x50, 0xa5, 0xb4, 0x8b, 0xc4, 0xa0, 0xfa, 0x7e, 0x87, 0x59, 0x5a, 0x97, 0x44, 0x1d, 0xe6, 0x7f,
+	0xe3, 0x7f, 0x90, 0xa8, 0x75, 0xa9, 0x67, 0x31, 0xe8, 0x30, 0xff, 0x38, 0xe1, 0x48, 0x5a, 0x44,
+	0x0b, 0xfb, 0x5d, 0x9b, 0xf5, 0x1f, 0x05, 0x8d, 0x2b, 0xad, 0xa2, 0xdc, 0xc3, 0x76, 0x38, 0x38,
+	0xaf, 0x55, 0xab, 0xaf, 0x17, 0xd1, 0xbf, 0xe3, 0x6d, 0x77, 0x48, 0x9c, 0x9e, 0xd1, 0x22, 0xf8,
+	0x4d, 0x1a, 0x89, 0xf7, 0x1d, 0x02, 0xfd, 0x8a, 0x6f, 0xcf, 0xd8, 0xc1, 0xa5, 0x59, 0x37, 0x4a,
+	0x6f, 0x53, 0x2f, 0xbe, 0x7d, 0x7f, 0x97, 0x7a, 0x95, 0x92, 0x5e, 0xa6, 0x94, 0xde, 0x4e, 0xf4,
+	0x02, 0x9c, 0x77, 0xff, 0x95, 0x41, 0xe2, 0x56, 0x0c, 0x95, 0x41, 0xf2, 0x0a, 0xc0, 0x30, 0x91,
+	0xe8, 0xa1, 0xe2, 0x12, 0x5b, 0x73, 0x34, 0x46, 0x1d, 0x65, 0xe0, 0x8d, 0x2c, 0x0c, 0x12, 0x25,
+	0x83, 0xd1, 0x48, 0x9d, 0xa3, 0x71, 0x62, 0xfd, 0x67, 0x53, 0xc2, 0x20, 0xd9, 0x82, 0x77, 0x60,
+	0x60, 0x3b, 0x04, 0x78, 0xa5, 0x32, 0x0c, 0x82, 0x24, 0xb6, 0xb9, 0xe3, 0x3a, 0xee, 0x78, 0x20,
+	0x77, 0x6c, 0x43, 0xd2, 0x24, 0xfe, 0x2c, 0x20, 0x14, 0x54, 0xa4, 0x4e, 0xdb, 0xfd, 0xbf, 0x50,
+	0x95, 0x0a, 0x2f, 0xca, 0x86, 0xb4, 0x3a, 0xa1, 0x24, 0x7b, 0x42, 0x05, 0x7f, 0x01, 0xb3, 0x75,
+	0xcf, 0x3c, 0xfd, 0xd3, 0x16, 0xaa, 0x4d, 0xb9, 0x71, 0xa4, 0xf1, 0x15, 0x6e, 0xf4, 0x86, 0xb4,
+	0x31, 0xa9, 0x77, 0x9a, 0xe0, 0x10, 0xdc, 0x96, 0x05, 0xfc, 0x51, 0x40, 0xe2, 0x01, 0xa5, 0xa7,
+	0x9e, 0x8d, 0xb7, 0xa7, 0x0c, 0x19, 0xdf, 0xad, 0xd9, 0x33, 0x2a, 0x73, 0xa3, 0x65, 0x7c, 0x6d,
+	0x62, 0x93, 0xfb, 0xf7, 0x75, 0x88, 0xdf, 0x0b, 0x28, 0x73, 0x60, 0xb8, 0x0c, 0xcf, 0x92, 0x96,
+	0xd9, 0x6d, 0x5e, 0xe7, 0x36, 0xd7, 0xf1, 0xa4, 0xc2, 0x6f, 0x0b, 0xf8, 0x13, 0xe4, 0xf1, 0xa9,
+	0xdd, 0xbe, 0xfc, 0x9a, 0xef, 0x70, 0x8f, 0x37, 0x4b, 0x53, 0xa6, 0xd2, 0xef, 0x51, 0xc8, 0xa6,
+	0xf8, 0x80, 0x98, 0x04, 0xbc, 0x5e, 0xbc, 0xe6, 0x33, 0x99, 0x0c, 0xeb, 0x5d, 0x99, 0xb6, 0xde,
+	0x5f, 0xa1, 0xde, 0xfb, 0xad, 0x13, 0x8a, 0xe5, 0xdf, 0x46, 0x83, 0xbf, 0x15, 0xf9, 0x90, 0x3f,
+	0x43, 0x91, 0xbb, 0x0b, 0xf2, 0x52, 0x8b, 0x1b, 0x7b, 0x86, 0xb7, 0x26, 0x19, 0x23, 0xe0, 0x46,
+	0x19, 0x04, 0x2f, 0xd2, 0xf1, 0x7f, 0x52, 0x51, 0xe9, 0x55, 0x63, 0xde, 0x5f, 0xdb, 0xcb, 0xf2,
+	0xb5, 0x63, 0x8c, 0x7f, 0x59, 0xf2, 0xf3, 0x3d, 0xef, 0xbf, 0x09, 0x97, 0x72, 0xa2, 0xa9, 0xdf,
+	0x00, 0xee, 0xda, 0x7f, 0x03, 0xb6, 0x85, 0x7a, 0xfe, 0x38, 0x17, 0x57, 0xae, 0x29, 0xf2, 0x1f,
+	0xbf, 0xda, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xdf, 0x20, 0xe0, 0x89, 0x0a, 0x00, 0x00,
 }
diff --git a/examples/examplepb/echo_service.pb.go b/examples/examplepb/echo_service.pb.go
index 781dd8c3998..b3cbcf7abfa 100644
--- a/examples/examplepb/echo_service.pb.go
+++ b/examples/examplepb/echo_service.pb.go
@@ -144,20 +144,20 @@ var _EchoService_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 230 bytes of a gzipped FileDescriptorProto
+	// 233 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x4d, 0xad, 0x48, 0xcc,
 	0x2d, 0xc8, 0x49, 0x2d, 0xd6, 0x87, 0x32, 0x0a, 0x92, 0xf4, 0x53, 0x93, 0x33, 0xf2, 0xe3, 0x8b,
 	0x53, 0x8b, 0xca, 0x32, 0x93, 0x53, 0xf5, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0x54, 0xd3, 0x53,
 	0xf3, 0xd2, 0xf3, 0xf5, 0xd2, 0x8b, 0x0a, 0x92, 0xf5, 0xd2, 0x13, 0x4b, 0x52, 0xcb, 0x13, 0x2b,
 	0xf5, 0x60, 0x3a, 0xf5, 0xe0, 0x3a, 0xa5, 0x64, 0xd2, 0xf3, 0xf3, 0xd3, 0x73, 0x52, 0xf5, 0x13,
 	0x0b, 0x32, 0xf5, 0x13, 0xf3, 0xf2, 0xf2, 0x4b, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x8a, 0x21, 0x86,
-	0x28, 0x49, 0x73, 0xf1, 0x06, 0x67, 0x82, 0x54, 0xfa, 0xa6, 0x16, 0x17, 0x27, 0xa6, 0xa7, 0x0a,
-	0x71, 0x71, 0x31, 0x65, 0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1a, 0xed, 0x61, 0xe2, 0xe2,
-	0x76, 0x05, 0x5a, 0x1c, 0x0c, 0xb1, 0x57, 0x68, 0x22, 0x23, 0x17, 0x0b, 0x88, 0x2f, 0x64, 0xa2,
-	0x47, 0x94, 0xdd, 0x7a, 0x28, 0x46, 0x4b, 0x91, 0xa5, 0x4b, 0x49, 0xb6, 0xe9, 0xf2, 0x93, 0xc9,
-	0x4c, 0xe2, 0x4a, 0xa2, 0xfa, 0x65, 0x86, 0xb0, 0x00, 0x01, 0x07, 0x87, 0x7e, 0x75, 0x66, 0x4a,
-	0xad, 0xd0, 0x0c, 0x46, 0x2e, 0x0e, 0x90, 0x9b, 0x9c, 0xf2, 0x53, 0x2a, 0xe9, 0xea, 0x2e, 0x05,
-	0xb0, 0xbb, 0xa4, 0x30, 0xdd, 0x15, 0x9f, 0x04, 0x74, 0x8a, 0x15, 0xa3, 0x96, 0x13, 0x77, 0x14,
-	0x27, 0x5c, 0x73, 0x12, 0x1b, 0x38, 0xbc, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfb, 0xc0,
-	0x4b, 0xba, 0xdd, 0x01, 0x00, 0x00,
+	0x28, 0xc9, 0x73, 0xf1, 0x06, 0x67, 0x82, 0x54, 0xfa, 0xa6, 0x16, 0x17, 0x27, 0xa6, 0xa7, 0x0a,
+	0xf1, 0x71, 0x31, 0x65, 0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x01, 0x59, 0x46, 0x7b,
+	0x98, 0xb8, 0xb8, 0x5d, 0x81, 0x96, 0x07, 0x43, 0xec, 0x16, 0x9a, 0xc8, 0xc8, 0xc5, 0x02, 0xe2,
+	0x0b, 0x99, 0xe8, 0x11, 0x65, 0xbf, 0x1e, 0x8a, 0xf1, 0x52, 0x64, 0xe9, 0x52, 0x92, 0x6d, 0xba,
+	0xfc, 0x64, 0x32, 0x93, 0xb8, 0x92, 0xa8, 0x7e, 0x99, 0x21, 0x2c, 0x50, 0xc0, 0x41, 0xa2, 0x5f,
+	0x9d, 0x99, 0x52, 0x2b, 0x34, 0x83, 0x91, 0x8b, 0x03, 0xe4, 0x26, 0xa7, 0xfc, 0x94, 0x4a, 0xba,
+	0xba, 0x4b, 0x01, 0xec, 0x2e, 0x29, 0x4c, 0x77, 0xc5, 0x27, 0x01, 0x9d, 0x62, 0xc5, 0xa8, 0xe5,
+	0xc4, 0x1d, 0xc5, 0x09, 0xd7, 0x9c, 0xc4, 0x06, 0x0e, 0x73, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0x2a, 0x5f, 0x67, 0x79, 0xe1, 0x01, 0x00, 0x00,
 }
diff --git a/examples/examplepb/flow_combination.pb.go b/examples/examplepb/flow_combination.pb.go
index 463f5d263a5..8c51b93cb1c 100644
--- a/examples/examplepb/flow_combination.pb.go
+++ b/examples/examplepb/flow_combination.pb.go
@@ -605,46 +605,47 @@ var _FlowCombination_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor2 = []byte{
-	// 651 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x96, 0x3f, 0x6f, 0xd3, 0x4e,
-	0x18, 0xc7, 0x75, 0xa9, 0xf4, 0x93, 0xf2, 0xe4, 0x97, 0x92, 0x3a, 0x28, 0x24, 0x21, 0xd0, 0xf6,
-	0x28, 0x22, 0x20, 0x61, 0x87, 0xc0, 0x80, 0x10, 0x53, 0x11, 0x8c, 0x55, 0xa1, 0x62, 0xf1, 0x82,
-	0xce, 0xae, 0x71, 0x23, 0x25, 0x3e, 0xd7, 0x31, 0x0a, 0x55, 0xd5, 0x85, 0x95, 0xb1, 0x23, 0x2f,
-	0x81, 0x91, 0x09, 0x36, 0x06, 0x66, 0x86, 0x4a, 0xbc, 0x02, 0x16, 0x5e, 0x01, 0x2b, 0xe7, 0xe7,
-	0xce, 0xbe, 0x18, 0x12, 0x1a, 0x0a, 0xf2, 0x50, 0xf5, 0xec, 0xe7, 0x8f, 0x3f, 0xf7, 0x7d, 0xbe,
-	0x77, 0x0a, 0x5c, 0xf7, 0x5e, 0xb2, 0x51, 0x38, 0xf4, 0xc6, 0x96, 0x5a, 0x84, 0x8e, 0xf5, 0x7c,
-	0xc8, 0x27, 0xcf, 0x5c, 0x3e, 0x72, 0x06, 0x01, 0x8b, 0x07, 0x3c, 0x30, 0xc3, 0x88, 0xc7, 0xdc,
-	0xb8, 0xea, 0x7b, 0x81, 0xcf, 0x4d, 0x3f, 0x0a, 0x5d, 0xd3, 0x67, 0xb1, 0x37, 0x61, 0x07, 0x66,
-	0x5a, 0x6d, 0x66, 0xd5, 0xed, 0x8e, 0xcf, 0xb9, 0x3f, 0xf4, 0x2c, 0x16, 0x0e, 0x2c, 0x16, 0x04,
-	0x3c, 0xc6, 0x1e, 0x63, 0xd9, 0x84, 0xfe, 0x0f, 0xf0, 0x70, 0x14, 0xc6, 0x07, 0xdb, 0xf8, 0xd4,
-	0x83, 0xea, 0x16, 0x0f, 0xf4, 0x0b, 0xa3, 0x0c, 0x84, 0x35, 0xc9, 0x1a, 0xe9, 0x96, 0x93, 0xa5,
-	0xd3, 0x2c, 0xa5, 0x4b, 0xb7, 0xb9, 0x94, 0x2c, 0x69, 0x0b, 0xe0, 0x69, 0xc0, 0x22, 0x95, 0x5e,
-	0x81, 0xa5, 0x71, 0x1c, 0xc9, 0x02, 0xca, 0xa0, 0xb2, 0xe5, 0x8d, 0x63, 0x6f, 0x57, 0xc6, 0xee,
-	0xa7, 0xad, 0x2a, 0xfd, 0x5b, 0xe6, 0x42, 0xe8, 0xe6, 0x54, 0xe7, 0xd9, 0x5f, 0x7f, 0x0c, 0x2b,
-	0x3b, 0x83, 0x40, 0xec, 0xee, 0x9f, 0x7d, 0xa8, 0xff, 0xa9, 0x06, 0xe7, 0x1e, 0x09, 0xc1, 0x1f,
-	0x68, 0xbd, 0x8d, 0xd7, 0x04, 0x2a, 0x4f, 0x42, 0x17, 0x75, 0x11, 0xff, 0x8d, 0x45, 0xdb, 0x6a,
-	0x21, 0xdb, 0x7f, 0x5e, 0x42, 0x1b, 0xaf, 0x4e, 0xbe, 0x1e, 0x97, 0x6a, 0x74, 0xd9, 0x12, 0x35,
-	0x96, 0x97, 0x04, 0x92, 0x95, 0x71, 0x4c, 0x60, 0x39, 0xa5, 0xd9, 0x89, 0x23, 0x8f, 0x8d, 0x0a,
-	0x02, 0x6a, 0x21, 0x50, 0x9d, 0xae, 0x4c, 0x01, 0x8d, 0x11, 0xa0, 0x47, 0x90, 0x4a, 0xd2, 0x14,
-	0x2c, 0x93, 0xa6, 0x92, 0x2c, 0x5a, 0xa9, 0x2e, 0x31, 0xde, 0x10, 0xe1, 0x10, 0x4d, 0x55, 0xa8,
-	0x5c, 0x1d, 0x04, 0x6b, 0xd0, 0xf3, 0x79, 0x30, 0xf9, 0xd0, 0x25, 0x42, 0xb3, 0xf7, 0x25, 0x00,
-	0x21, 0xd4, 0x26, 0xdf, 0x45, 0xbd, 0xee, 0x2c, 0xf8, 0x8d, 0xdc, 0x11, 0x3d, 0x0b, 0xd9, 0x47,
-	0x82, 0x68, 0x1f, 0x08, 0xad, 0xe2, 0x28, 0x1d, 0x01, 0x90, 0x2c, 0xee, 0x91, 0x1b, 0xf6, 0x45,
-	0xda, 0xc2, 0x77, 0x21, 0x8b, 0xf7, 0xac, 0x43, 0x76, 0x64, 0x1d, 0x3a, 0xe2, 0xcf, 0x3d, 0x4a,
-	0x5e, 0xda, 0xa9, 0x19, 0xf7, 0x5f, 0x78, 0x11, 0x56, 0xd8, 0xab, 0xb4, 0xad, 0x5b, 0xe4, 0x6a,
-	0xb0, 0x9f, 0x6b, 0x37, 0x69, 0x5d, 0x27, 0x64, 0x75, 0x49, 0x64, 0x9d, 0x76, 0x66, 0x94, 0xe6,
-	0x52, 0x5a, 0xf4, 0x42, 0x1e, 0x26, 0x8b, 0x1a, 0x6f, 0x09, 0x34, 0x84, 0x68, 0xdb, 0x22, 0x32,
-	0x7d, 0x05, 0x24, 0x3a, 0xde, 0x5d, 0x50, 0x91, 0x5f, 0xae, 0x8e, 0xb3, 0x68, 0xb9, 0x81, 0x52,
-	0x5e, 0x56, 0x7b, 0x49, 0x40, 0x6f, 0x06, 0xd8, 0x51, 0xf0, 0x9a, 0x62, 0xd6, 0x28, 0x84, 0xf1,
-	0x8d, 0x40, 0x4d, 0xd1, 0x6a, 0xce, 0xfe, 0xa2, 0xf3, 0xfe, 0x3b, 0xc2, 0x00, 0x09, 0xf7, 0xe8,
-	0xda, 0x5c, 0xc2, 0xa9, 0x71, 0x9d, 0xb2, 0x91, 0x6c, 0x68, 0x73, 0xe2, 0xa2, 0x85, 0x71, 0x52,
-	0x82, 0xaa, 0x72, 0xb5, 0x3a, 0x6f, 0x85, 0x19, 0xfb, 0x8b, 0x34, 0xf6, 0x67, 0x42, 0x6b, 0xda,
-	0x5a, 0xf2, 0xc0, 0x25, 0xde, 0x9e, 0xde, 0x5c, 0xce, 0xdb, 0x32, 0xc5, 0x4e, 0xaf, 0x36, 0xe9,
-	0x32, 0xf5, 0x92, 0xd2, 0x4b, 0x73, 0x1c, 0x9e, 0x36, 0x76, 0xc5, 0xa1, 0x69, 0xfc, 0x6c, 0x72,
-	0x1d, 0xdc, 0xa0, 0xab, 0x73, 0x7d, 0xae, 0xb3, 0x3a, 0xea, 0x20, 0xcd, 0x4c, 0x10, 0x77, 0xc5,
-	0x3b, 0x02, 0xad, 0x19, 0x7e, 0x57, 0x0a, 0x17, 0x6a, 0xf9, 0x6b, 0x28, 0xf2, 0xba, 0xda, 0xd6,
-	0x2c, 0x27, 0x64, 0xd4, 0xdf, 0x09, 0xd4, 0x73, 0xbe, 0x57, 0xbc, 0x05, 0x59, 0x7f, 0x82, 0xa4,
-	0xfb, 0xf4, 0xca, 0x6f, 0xad, 0xaf, 0x87, 0x70, 0xfa, 0x9e, 0xb2, 0x69, 0xce, 0x4f, 0x11, 0x8d,
-	0x7a, 0x64, 0xb3, 0x62, 0x97, 0x33, 0x24, 0xe7, 0x3f, 0xfc, 0xb1, 0x75, 0xfb, 0x47, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x94, 0xb8, 0xb0, 0x35, 0xde, 0x09, 0x00, 0x00,
+	// 658 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x96, 0xbf, 0x6f, 0xd3, 0x40,
+	0x14, 0xc7, 0x75, 0xa9, 0x84, 0xd4, 0x4b, 0x53, 0x52, 0x07, 0x85, 0x24, 0x84, 0xfe, 0x38, 0x8a,
+	0x08, 0x48, 0xd8, 0x25, 0x30, 0x00, 0x0b, 0x52, 0x11, 0x8c, 0x55, 0xd5, 0xc2, 0xe2, 0x05, 0x9d,
+	0x5d, 0xe3, 0x06, 0x25, 0x3e, 0xd7, 0x31, 0x0a, 0x55, 0xd5, 0x85, 0x95, 0xb1, 0x23, 0x7f, 0x02,
+	0x23, 0x13, 0x6c, 0x0c, 0xcc, 0x0c, 0x95, 0xf8, 0x0b, 0x58, 0xf8, 0x0b, 0x58, 0xb9, 0x7b, 0x77,
+	0xf6, 0xc5, 0x90, 0x10, 0x53, 0x90, 0x87, 0xaa, 0xf7, 0xeb, 0x3d, 0x7f, 0xde, 0xf7, 0x7d, 0xef,
+	0x14, 0x7c, 0xdd, 0x7b, 0x45, 0x07, 0x61, 0xdf, 0x1b, 0x5a, 0x6a, 0x10, 0x3a, 0xd6, 0xf3, 0x3e,
+	0x1b, 0x3d, 0x73, 0xd9, 0xc0, 0xe9, 0x05, 0x34, 0xee, 0xb1, 0xc0, 0x0c, 0x23, 0x16, 0x33, 0xe3,
+	0xaa, 0xef, 0x05, 0x3e, 0x33, 0xfd, 0x28, 0x74, 0x4d, 0x9f, 0xc6, 0xde, 0x88, 0x1e, 0x9a, 0x49,
+	0xb4, 0x99, 0x46, 0xb7, 0xda, 0x3e, 0x63, 0x7e, 0xdf, 0xb3, 0x68, 0xd8, 0xb3, 0x68, 0x10, 0xb0,
+	0x18, 0x72, 0x0c, 0x65, 0x12, 0xb2, 0x80, 0xf1, 0xa3, 0x41, 0x18, 0x1f, 0x6e, 0xc3, 0xec, 0x1e,
+	0xae, 0x6c, 0xb1, 0x40, 0x2f, 0x18, 0x0b, 0x18, 0xd1, 0x06, 0x5a, 0x45, 0x9d, 0xf9, 0x1d, 0x44,
+	0xc5, 0xcc, 0x69, 0x94, 0xe4, 0xcc, 0x11, 0x33, 0xb7, 0x31, 0x27, 0x67, 0x2e, 0x59, 0xc6, 0xf8,
+	0x69, 0x40, 0x23, 0x15, 0x57, 0xc5, 0x73, 0xc3, 0x38, 0x52, 0x91, 0x62, 0x48, 0x5e, 0xe0, 0xf2,
+	0x96, 0x37, 0x8c, 0xbd, 0x3d, 0x79, 0xe0, 0x41, 0x92, 0xb8, 0xdc, 0xbd, 0x65, 0xe6, 0x2a, 0xc4,
+	0xd4, 0xe9, 0x67, 0xb1, 0x3c, 0xc1, 0x4b, 0xbb, 0xbd, 0x80, 0x17, 0xfd, 0x3f, 0xbf, 0xd8, 0xfd,
+	0x5c, 0xc5, 0xe7, 0x1f, 0xf3, 0x56, 0x3c, 0xd4, 0x9d, 0x30, 0xde, 0x20, 0x5c, 0xde, 0x09, 0x5d,
+	0x50, 0x8c, 0xff, 0x37, 0xf2, 0x66, 0xd6, 0x12, 0xb7, 0xfe, 0x3e, 0x84, 0xd4, 0x5f, 0x9f, 0x7e,
+	0x3b, 0x29, 0x55, 0xc9, 0xa2, 0xc5, 0x63, 0x2c, 0x4f, 0x6c, 0x88, 0x91, 0x71, 0x82, 0xf0, 0x62,
+	0x42, 0xb3, 0x1b, 0x47, 0x1e, 0x1d, 0x14, 0x04, 0xd4, 0x04, 0xa0, 0x1a, 0x59, 0x1a, 0x03, 0x1a,
+	0x02, 0xc0, 0x06, 0x02, 0x2a, 0x49, 0x53, 0xb0, 0x4c, 0x9a, 0x4a, 0xb2, 0x68, 0xa5, 0x3a, 0xc8,
+	0x78, 0x8b, 0xb8, 0x49, 0x34, 0x55, 0xa1, 0x72, 0xb5, 0x01, 0xac, 0x4e, 0x2e, 0x64, 0xc1, 0xe4,
+	0xa4, 0x83, 0xb8, 0x66, 0x1f, 0x4a, 0x18, 0x73, 0xa1, 0x36, 0xd9, 0x1e, 0xe8, 0x75, 0x27, 0xe7,
+	0x37, 0x32, 0x97, 0xf7, 0x2c, 0x64, 0x9f, 0x10, 0xa0, 0x7d, 0x44, 0xa4, 0x02, 0xad, 0x74, 0x38,
+	0x80, 0x18, 0xdc, 0x47, 0x37, 0xec, 0x4b, 0xa4, 0x09, 0x6b, 0x21, 0x8d, 0xf7, 0xad, 0x23, 0x7a,
+	0x6c, 0x1d, 0x39, 0xfc, 0xcf, 0x3d, 0x16, 0x8b, 0x76, 0x62, 0xc6, 0x83, 0x97, 0x5e, 0x04, 0x11,
+	0xf6, 0x0a, 0x69, 0xe9, 0x14, 0x99, 0x18, 0xc8, 0xe7, 0xda, 0x0d, 0x52, 0xd3, 0x07, 0xd2, 0x38,
+	0xb1, 0xb3, 0x46, 0xda, 0x13, 0x42, 0x33, 0x47, 0x9a, 0xe4, 0x62, 0x16, 0x26, 0xdd, 0x35, 0xde,
+	0x21, 0x5c, 0xe7, 0xa2, 0x6d, 0xf3, 0x9d, 0xf1, 0x57, 0x40, 0xe8, 0x78, 0x37, 0xa7, 0x22, 0xbf,
+	0xbd, 0x1e, 0x67, 0xd1, 0x72, 0x1d, 0xa4, 0x5c, 0x56, 0xb5, 0x08, 0xd0, 0x9b, 0x01, 0x64, 0xe4,
+	0xbc, 0x26, 0xef, 0x35, 0x08, 0x61, 0x7c, 0x47, 0xb8, 0xaa, 0x68, 0x35, 0x67, 0x37, 0x6f, 0xbf,
+	0xff, 0x8d, 0x30, 0x00, 0xc2, 0x7d, 0xb2, 0x3a, 0x95, 0x70, 0xac, 0x5d, 0x33, 0x0a, 0x49, 0x9b,
+	0x36, 0x65, 0x9f, 0xa7, 0x30, 0x4e, 0x4b, 0xb8, 0xa2, 0x5c, 0xad, 0xee, 0x5b, 0x61, 0xc6, 0xfe,
+	0x2a, 0x8d, 0xfd, 0x05, 0x91, 0xaa, 0xb6, 0x96, 0xbc, 0x70, 0xc2, 0xdb, 0xe3, 0xc5, 0x65, 0xbc,
+	0x2d, 0x8f, 0xd8, 0xc9, 0xd3, 0x26, 0x5d, 0xa6, 0x16, 0x09, 0xb9, 0x3c, 0xc5, 0xe1, 0x49, 0x62,
+	0x97, 0x5f, 0x9a, 0xfa, 0xaf, 0x26, 0xd7, 0x9b, 0xeb, 0x64, 0x65, 0xaa, 0xcf, 0xf5, 0xa9, 0xb6,
+	0xba, 0x48, 0x13, 0x0f, 0xf0, 0xb7, 0xe2, 0x3d, 0xc2, 0xcd, 0x09, 0x7e, 0x57, 0x0a, 0x17, 0x6a,
+	0xf9, 0x6b, 0x20, 0xf2, 0x9a, 0x2a, 0x6b, 0x92, 0x13, 0x52, 0xea, 0x1f, 0x08, 0xd7, 0x32, 0xbe,
+	0x57, 0xbc, 0x05, 0x59, 0x7f, 0x04, 0xa4, 0x07, 0xe4, 0xca, 0x1f, 0xad, 0xaf, 0x9b, 0x30, 0xbb,
+	0xa6, 0xb4, 0x9b, 0xd3, 0x8f, 0xf0, 0x44, 0x1b, 0x68, 0xb3, 0x6c, 0xcf, 0xa7, 0x48, 0xce, 0x39,
+	0xf8, 0x19, 0x76, 0xfb, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x90, 0xd0, 0xd7, 0xf8, 0x09,
+	0x00, 0x00,
 }
diff --git a/examples/sub/message.pb.go b/examples/sub/message.pb.go
index de0b674eba6..841d9401588 100644
--- a/examples/sub/message.pb.go
+++ b/examples/sub/message.pb.go
@@ -48,12 +48,13 @@ func init() {
 }
 
 var fileDescriptor0 = []byte{
-	// 112 bytes of a gzipped FileDescriptorProto
+	// 115 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0x4a, 0xad, 0x48, 0xcc,
 	0x2d, 0xc8, 0x49, 0x2d, 0xd6, 0x2f, 0x2e, 0x4d, 0xd2, 0xcf, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f,
 	0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x4f, 0x4f, 0xcd, 0x4b, 0xcf, 0xd7, 0x4b, 0x2f,
 	0x2a, 0x48, 0xd6, 0x4b, 0x4f, 0x2c, 0x49, 0x2d, 0x4f, 0xac, 0xd4, 0x83, 0x29, 0xd7, 0x03, 0x2a,
-	0x57, 0x92, 0xe3, 0xe2, 0x0d, 0x2e, 0x29, 0xca, 0xcc, 0x4b, 0xf7, 0x85, 0xe8, 0x13, 0xe2, 0xe5,
-	0x62, 0x2d, 0x4b, 0xcc, 0x29, 0x4d, 0x95, 0x60, 0x54, 0x60, 0xd2, 0xe0, 0x74, 0x62, 0x8d, 0x62,
-	0x06, 0x2a, 0x03, 0x04, 0x00, 0x00, 0xff, 0xff, 0x02, 0xf3, 0x2d, 0x2f, 0x64, 0x00, 0x00, 0x00,
+	0x57, 0x52, 0xe5, 0xe2, 0x0d, 0x2e, 0x29, 0xca, 0xcc, 0x4b, 0xf7, 0x85, 0xe8, 0x13, 0x12, 0xe1,
+	0x62, 0x2d, 0x4b, 0xcc, 0x29, 0x4d, 0x95, 0x60, 0x54, 0x60, 0xd2, 0xe0, 0x0c, 0x82, 0x70, 0x9c,
+	0x58, 0xa3, 0x98, 0x81, 0xaa, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc1, 0x7f, 0x95, 0xcd, 0x6b,
+	0x00, 0x00, 0x00,
 }
diff --git a/third_party/googleapis/google/api/annotations.pb.go b/third_party/googleapis/google/api/annotations.pb.go
index b24acb462aa..1243ecca485 100644
--- a/third_party/googleapis/google/api/annotations.pb.go
+++ b/third_party/googleapis/google/api/annotations.pb.go
@@ -42,16 +42,16 @@ func init() {
 }
 
 var fileDescriptor0 = []byte{
-	// 164 bytes of a gzipped FileDescriptorProto
+	// 167 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0x49, 0xcf, 0xcf, 0x4f,
 	0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0x4f, 0xcc, 0xcb, 0xcb, 0x2f, 0x49, 0x2c, 0xc9, 0xcc,
 	0xcf, 0x2b, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x82, 0xc8, 0xea, 0x01, 0x65, 0xa5,
 	0x44, 0x91, 0x54, 0x66, 0x94, 0x94, 0x14, 0x40, 0x94, 0x48, 0x29, 0x40, 0x85, 0xc1, 0xbc, 0xa4,
 	0xd2, 0x34, 0xfd, 0x94, 0xd4, 0xe2, 0xe4, 0xa2, 0xcc, 0x82, 0x92, 0xfc, 0x22, 0x88, 0x0a, 0x2b,
-	0x57, 0x2e, 0x16, 0x90, 0x7a, 0x21, 0x39, 0x3d, 0xa8, 0x69, 0x30, 0xa5, 0x7a, 0xbe, 0xa9, 0x25,
+	0x6f, 0x2e, 0x16, 0x90, 0x7a, 0x21, 0x39, 0x3d, 0xa8, 0x69, 0x30, 0xa5, 0x7a, 0xbe, 0xa9, 0x25,
 	0x19, 0xf9, 0x29, 0xfe, 0x05, 0x60, 0x2b, 0x25, 0x36, 0x9c, 0xda, 0xa3, 0xa4, 0xc0, 0xa8, 0xc1,
-	0x6d, 0x24, 0xa2, 0x87, 0xb0, 0x56, 0xcf, 0x03, 0xa8, 0x35, 0xa8, 0x34, 0x27, 0xd5, 0x49, 0x85,
-	0x8b, 0x2f, 0x39, 0x3f, 0x17, 0x49, 0xca, 0x49, 0xc0, 0x11, 0xe1, 0xe0, 0x00, 0x90, 0x99, 0x01,
-	0x8c, 0x49, 0x6c, 0x60, 0xc3, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x36, 0x43, 0xa8, 0xf7,
-	0xd8, 0x00, 0x00, 0x00,
+	0x6d, 0x24, 0xa2, 0x87, 0xb0, 0x56, 0xcf, 0x03, 0xa8, 0x35, 0xa8, 0x34, 0x27, 0x35, 0x08, 0x6c,
+	0x88, 0x93, 0x0a, 0x17, 0x5f, 0x72, 0x7e, 0x2e, 0x92, 0x02, 0x27, 0x01, 0x47, 0x84, 0xb3, 0x03,
+	0x40, 0x26, 0x07, 0x30, 0x26, 0xb1, 0x81, 0xad, 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x4f,
+	0xd1, 0x89, 0x83, 0xde, 0x00, 0x00, 0x00,
 }
diff --git a/third_party/googleapis/google/api/http.pb.go b/third_party/googleapis/google/api/http.pb.go
index c8372119351..b1acdf279e9 100644
--- a/third_party/googleapis/google/api/http.pb.go
+++ b/third_party/googleapis/google/api/http.pb.go
@@ -336,21 +336,23 @@ func init() {
 }
 
 var fileDescriptor1 = []byte{
-	// 248 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x64, 0x90, 0xc1, 0x4e, 0x83, 0x40,
-	0x10, 0x86, 0x45, 0x28, 0x2d, 0x53, 0xad, 0x8a, 0x9a, 0xcc, 0xa5, 0x49, 0xd3, 0x93, 0x27, 0x88,
-	0xfa, 0x06, 0x78, 0xe9, 0xb1, 0xf1, 0x05, 0xcc, 0xc2, 0x6e, 0x60, 0x23, 0x65, 0x36, 0x65, 0x38,
-	0xf8, 0xa6, 0x3e, 0x8e, 0xbb, 0xb0, 0x46, 0x12, 0x8f, 0xff, 0xbf, 0x3b, 0xdf, 0x97, 0x19, 0x78,
-	0xac, 0x89, 0xea, 0x56, 0xe5, 0xc2, 0xe8, 0xbc, 0x61, 0x36, 0x99, 0x39, 0x13, 0x53, 0x0a, 0x53,
-	0x9d, 0xd9, 0x7a, 0xff, 0x1d, 0xc0, 0xea, 0x60, 0x9f, 0xde, 0x87, 0x56, 0xa5, 0xd7, 0x10, 0xd6,
-	0x8a, 0xf1, 0x72, 0x17, 0x3c, 0x25, 0x87, 0x0b, 0x17, 0xcd, 0xc0, 0x18, 0xfa, 0xb8, 0x81, 0xc8,
-	0x50, 0xcf, 0x18, 0xf9, 0x7c, 0x0b, 0xb1, 0x54, 0xad, 0x62, 0x85, 0x0b, 0xdf, 0xdc, 0xc0, 0xc2,
-	0x08, 0xae, 0x1a, 0x8c, 0x7d, 0x91, 0x43, 0x5c, 0x0d, 0x3d, 0xd3, 0x09, 0x57, 0xb6, 0x59, 0xbf,
-	0x6c, 0xb3, 0x3f, 0x75, 0xf6, 0x36, 0xbe, 0x38, 0xf9, 0x51, 0x30, 0xab, 0x73, 0x67, 0x07, 0xae,
-	0x20, 0x2a, 0x49, 0x7e, 0xe1, 0xd2, 0x01, 0xd2, 0x67, 0xb8, 0x17, 0x52, 0x6a, 0xd6, 0xd4, 0x89,
-	0xf6, 0xa3, 0xd4, 0x9d, 0xd4, 0x5d, 0xdd, 0xe3, 0x7a, 0x17, 0x5a, 0xd6, 0xc3, 0x9c, 0xf5, 0xbb,
-	0x42, 0x91, 0xc0, 0xd2, 0x4c, 0xb4, 0x7d, 0x0e, 0x77, 0xff, 0x14, 0x4e, 0xf0, 0x69, 0x39, 0x18,
-	0x8c, 0x02, 0x9b, 0xec, 0xef, 0x66, 0xda, 0xb8, 0xd8, 0xc2, 0xa6, 0xa2, 0xd3, 0x0c, 0x5b, 0x24,
-	0xe3, 0xa8, 0x3b, 0xda, 0x31, 0x28, 0xe3, 0xf1, 0x7a, 0xaf, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
-	0x2b, 0x79, 0xb0, 0xf6, 0x56, 0x01, 0x00, 0x00,
+	// 277 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x64, 0x51, 0xbd, 0x6a, 0xf3, 0x40,
+	0x10, 0xfc, 0x64, 0xc9, 0xb2, 0xb5, 0x86, 0x0f, 0x72, 0x71, 0xc2, 0x36, 0x06, 0xe3, 0x2a, 0x95,
+	0x0c, 0x49, 0x91, 0x22, 0x9d, 0x42, 0xc0, 0xa5, 0xd1, 0x0b, 0x04, 0x49, 0x77, 0x48, 0x47, 0x64,
+	0xdd, 0x61, 0xad, 0x8a, 0x3c, 0x4a, 0xde, 0x36, 0xf7, 0x67, 0x6c, 0x48, 0xb7, 0x33, 0xb3, 0x37,
+	0x33, 0xd2, 0xc2, 0x43, 0xab, 0x54, 0xdb, 0x8b, 0x7d, 0xa5, 0xe5, 0xbe, 0x23, 0xd2, 0xb9, 0x3e,
+	0x2b, 0x52, 0x0c, 0x3c, 0x9d, 0x1b, 0x7a, 0xf7, 0x33, 0x83, 0xe5, 0xc1, 0x48, 0xe5, 0xd4, 0x0b,
+	0xc6, 0x20, 0x6e, 0x05, 0xe1, 0x6c, 0x1b, 0x3d, 0x65, 0x87, 0x7f, 0xa5, 0x05, 0x96, 0xd3, 0x13,
+	0x61, 0x7c, 0xe1, 0x0c, 0x60, 0x6b, 0x48, 0xb4, 0x1a, 0x09, 0x93, 0x40, 0x3a, 0xc4, 0x10, 0x52,
+	0x2e, 0x7a, 0x41, 0x02, 0xe7, 0x81, 0x0f, 0x98, 0x3d, 0xc2, 0x5c, 0x57, 0xd4, 0x74, 0x98, 0x06,
+	0xc1, 0x43, 0xf6, 0x0a, 0x69, 0x33, 0x8d, 0xa4, 0x4e, 0xb8, 0x34, 0xc2, 0xea, 0x79, 0x93, 0x5f,
+	0x9b, 0xe5, 0xef, 0x4e, 0xb1, 0xdd, 0x8e, 0x15, 0x91, 0x38, 0x0f, 0xd6, 0xd0, 0xaf, 0x9b, 0x52,
+	0x49, 0xad, 0xf8, 0x37, 0x2e, 0xac, 0x5f, 0xe9, 0x66, 0xf6, 0x01, 0xf7, 0x15, 0xe7, 0x92, 0xa4,
+	0x1a, 0xaa, 0xfe, 0xb3, 0x96, 0x03, 0x97, 0x43, 0x3b, 0xe2, 0x6a, 0x1b, 0x1b, 0xe7, 0xf5, 0xad,
+	0xf3, 0xe5, 0x7b, 0x4b, 0x76, 0x7d, 0x50, 0x84, 0xfd, 0x22, 0x83, 0x85, 0xf6, 0x79, 0xbb, 0x37,
+	0xb8, 0xfb, 0x53, 0xc2, 0x46, 0x7f, 0x99, 0x5d, 0x8c, 0x7c, 0xb4, 0x9d, 0x2d, 0x67, 0xde, 0x74,
+	0xfe, 0xc7, 0x95, 0x6e, 0x2e, 0x36, 0xf0, 0xbf, 0x51, 0xa7, 0x9b, 0xd8, 0x22, 0x73, 0x36, 0xf6,
+	0x02, 0xc7, 0xa8, 0x4e, 0xdd, 0x29, 0x5e, 0x7e, 0x03, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x89, 0x57,
+	0x7f, 0xa3, 0x01, 0x00, 0x00,
 }